move most repository git config into included files & some tidying

14 files changed, 178 insertions, 0 deletions

diff --git a/lib-src/git/annex b/lib-src/git/annex
new file mode 100644
index 00000000..e7fac000
--- /dev/null
+++ b/lib-src/git/annex
@@ -0,0 +1,16 @@
+# -*- conf -*-
+
+[annex]
+	# Needed for 'git annex sync'.
+	autocommit = true
+
+	startupscan = false
+
+[push]
+	default = nothing
+
+[remote "origin"]
+	annex-ignore = true
+
+[unpushed-tags]
+	ignore = true
diff --git a/lib-src/git/doc b/lib-src/git/doc
new file mode 100644
index 00000000..d6d62cfc
--- /dev/null
+++ b/lib-src/git/doc
@@ -0,0 +1,4 @@
+# -*- conf -*-
+
+[branch "master"]
+	rebase = false
diff --git a/lib-src/git/includes b/lib-src/git/includes
new file mode 100644
index 00000000..f1a4be2c
--- /dev/null
+++ b/lib-src/git/includes
@@ -0,0 +1,26 @@
+[includeIf "gitdir:~/annex/"]
+	path = ~/src/dotfiles/lib-src/git/annex
+[includeIf "gitdir:~/doc/"]
+	path = ~/src/dotfiles/lib-src/git/doc
+[includeIf "gitdir:~/lib/annex/"]
+	path = ~/src/dotfiles/lib-src/git/lib/annex
+[includeIf "gitdir:~/lib/athena-apt/"]
+	path = ~/src/dotfiles/lib-src/git/lib/athena-apt
+[includeIf "gitdir:~/lib/podcasts/"]
+	path = ~/src/dotfiles/lib-src/git/lib/podcasts
+[includeIf "gitdir:~/lib/priv/"]
+	path = ~/src/dotfiles/lib-src/git/lib/priv
+[includeIf "gitdir:~/lib/wikiannex/"]
+	path = ~/src/dotfiles/lib-src/git/lib/wikiannex
+[includeIf "gitdir:~/src/athpriv/"]
+	path = ~/src/dotfiles/lib-src/git/src/athpriv
+[includeIf "gitdir:~/src/dotfiles/"]
+	path = ~/src/dotfiles/lib-src/git/src/dotfiles
+[includeIf "gitdir:~/src/emacs/"]
+	path = ~/src/dotfiles/lib-src/git/src/emacs
+[includeIf "gitdir:~/src/notmuch/"]
+	path = ~/src/dotfiles/lib-src/git/src/notmuch
+[includeIf "gitdir:~/src/p5-API-GitForge/"]
+	path = ~/src/dotfiles/lib-src/git/src/p5-API-GitForge
+[includeIf "gitdir:~/src/p5-Git-Annex/"]
+	path = ~/src/dotfiles/lib-src/git/src/p5-Git-Annex
diff --git a/lib-src/git/lib/annex b/lib-src/git/lib/annex
new file mode 100644
index 00000000..af5585d3
--- /dev/null
+++ b/lib-src/git/lib/annex
@@ -0,0 +1,16 @@
+# -*- conf -*-
+
+[annex]
+	# Needed for 'git annex sync'.
+	autocommit = true
+
+	startupscan = false
+
+[push]
+	default = matching
+
+[remote "origin"]
+	annex-ignore = true
+
+[unpushed-tags]
+	ignore = true
diff --git a/lib-src/git/lib/athena-apt b/lib-src/git/lib/athena-apt
new file mode 100644
index 00000000..e4e1205b
--- /dev/null
+++ b/lib-src/git/lib/athena-apt
@@ -0,0 +1,24 @@
+# -*- conf -*-
+
+[annex]
+	# Needed for 'git annex sync'.
+	autocommit = true
+
+	addunlocked = true
+	startupscan = false
+	thin = true
+
+[mrrepos]
+	review-unused = false
+
+[push]
+	default = matching
+
+[remote "demeter"]
+	annex-tracking-branch = master
+
+[remote "origin"]
+	annex-ignore = true
+
+[unpushed-tags]
+	ignore = true
diff --git a/lib-src/git/lib/podcasts b/lib-src/git/lib/podcasts
new file mode 100644
index 00000000..2795090d
--- /dev/null
+++ b/lib-src/git/lib/podcasts
@@ -0,0 +1,19 @@
+# -*- conf -*-
+
+# origin remote is just for keeping a backup copy of metadata.  We don't sync
+# annexed content between repos at all, just run update-and-sync and download
+# episodes as want to listen to them.  For archival, for podcasts for which
+# that's wanted, annex-to-annex the files into ~/annex instead of 'git rm'.
+
+[annex]
+	# Needed for 'git annex sync'.
+	autocommit = true
+
+	genmetadata = true
+	startupscan = false
+
+[push]
+	default = matching
+
+[remote "origin"]
+	annex-ignore = true
diff --git a/lib-src/git/lib/priv b/lib-src/git/lib/priv
new file mode 100644
index 00000000..d4bfffc7
--- /dev/null
+++ b/lib-src/git/lib/priv
@@ -0,0 +1,21 @@
+# -*- conf -*-
+
+[annex]
+	# Needed for 'git annex sync'.
+	autocommit = true
+
+	gitaddtoannex = false
+	addunlocked = true
+	startupscan = false
+
+[mrrepo]
+	review-unused = false
+
+[push]
+	default = nothing
+
+[remote "origin"]
+	annex-ignore = true
+
+[unpushed-tags]
+	ignore = true
diff --git a/lib-src/git/lib/wikiannex b/lib-src/git/lib/wikiannex
new file mode 100644
index 00000000..552b741d
--- /dev/null
+++ b/lib-src/git/lib/wikiannex
@@ -0,0 +1,7 @@
+# -*- conf -*-
+
+[remote "origin"]
+	annex-ignore = true
+
+[unpushed-tags]
+	ignore = true
diff --git a/lib-src/git/src/athpriv b/lib-src/git/src/athpriv
new file mode 100644
index 00000000..9686a7a2
--- /dev/null
+++ b/lib-src/git/src/athpriv
@@ -0,0 +1,14 @@
+# -*- conf -*-
+
+[annex]
+	addunlocked = true
+	synconlyannex = true
+
+[mrrepo]
+	review-unused = false
+
+[remote "origin"]
+	annex-ignore = true
+
+[unpushed-tags]
+	ignore = true
diff --git a/lib-src/git/src/dotfiles b/lib-src/git/src/dotfiles
new file mode 100644
index 00000000..be8f950a
--- /dev/null
+++ b/lib-src/git/src/dotfiles
@@ -0,0 +1,10 @@
+# -*- conf -*-
+
+[push]
+	default = nothing
+
+[remote]
+	pushDefault = origin
+
+[user]
+	signingkey = 8DC2487E51ABDD90B5C4753F0F56D0553B6D411B
diff --git a/lib-src/git/src/emacs b/lib-src/git/src/emacs
new file mode 100644
index 00000000..11868dd6
--- /dev/null
+++ b/lib-src/git/src/emacs
@@ -0,0 +1,9 @@
+# -*- conf -*-
+
+[branch "deb/emacs/d/sid/master"]
+	dpmUpstreamBranch = deb/emacs/d/sid/upstream
+	dpmPatchedBranch = deb/emacs/d/sid/patched
+
+[branch "deb/emacs-non-dfsg/d/sid/master"]
+	dpmUpstreamBranch = deb/emacs-non-dfsg/d/sid/upstream
+	dpmPatchedBranch = deb/emacs-non-dfsg/d/sid/patched
diff --git a/lib-src/git/src/notmuch b/lib-src/git/src/notmuch
new file mode 100644
index 00000000..fc519eff
--- /dev/null
+++ b/lib-src/git/src/notmuch
@@ -0,0 +1,4 @@
+# -*- conf -*-
+
+[sendemail]
+	to = notmuch@notmuchmail.org
diff --git a/lib-src/git/src/p5-API-GitForge b/lib-src/git/src/p5-API-GitForge
new file mode 100644
index 00000000..dacfc1b6
--- /dev/null
+++ b/lib-src/git/src/p5-API-GitForge
@@ -0,0 +1,4 @@
+# -*- conf -*-
+
+[branch "debian"]
+	signOffOptional = true
diff --git a/lib-src/git/src/p5-Git-Annex b/lib-src/git/src/p5-Git-Annex
new file mode 100644
index 00000000..dacfc1b6
--- /dev/null
+++ b/lib-src/git/src/p5-Git-Annex
@@ -0,0 +1,4 @@
+# -*- conf -*-
+
+[branch "debian"]
+	signOffOptional = true