move most repository git config into included files & some tidying

15 files changed, 180 insertions, 77 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
diff --git a/lib-src/mr/config b/lib-src/mr/config
index 19d18e8c..a6e738ba 100644
--- a/lib-src/mr/config
+++ b/lib-src/mr/config
@@ -158,19 +158,6 @@ fixups =
           .gnupg/*.kbx \
           .gnupg/private-keys-v1.d/*.key \
           .ssh/id_*
-    #
-    git config push.default nothing
-    git config remote.origin.gcrypt-publish-participants true
-    git config remote.origin.gcrypt-participants 0x0F56D0553B6D411B
-    git config annex.startupscan false
-    git config annex.autocommit true # needed for `git annex sync`
-    git config remote.origin.annex-ignore true
-    git config unpushed-tags.ignore true
-    #
-    git config annex.gitaddtoannex false # see README
-    git config annex.addunlocked true    # see README
-    #
-    git config mrrepo.review-unused false
 
 autoci =
         hstow stow ~/lib/priv	# to perform adoptions
@@ -193,15 +180,8 @@ post_checkout =
     on athena || git remote add athenah athenah:src/athpriv
     git annex group . backup
 
-fixups =
-    git config remote.origin.annex-ignore true
-    git config unpushed-tags.ignore true
-    git config annex.addunlocked true
-    git config annex.synconlyannex true
-    #
-    # TODO Use git-annex-whereused to systematically drop old News/*.
-    git config mrrepo.review-unused false
-
+# TODO Use git-annex-whereused to systematically drop old News/*.
+#
 # We also ran:
 #   % git annex config --set annex.largefiles "include=*.SCORE or include=*.ADAPT"
 
@@ -282,7 +262,6 @@ post_checkout =
     install-git-hooks p5-Git-Annex
     git remote add -f salsa salsa:perl-team/modules/packages/libgit-annex-perl ||:
     git branch --track debian salsa/master
-    git config branch.debian.signOffOptional true
     git config branch.buster-bpo.signOffOptional true
 skip = lazy
 
@@ -293,7 +272,6 @@ post_checkout =
     install-git-hooks p5-API-GitForge
     git remote add -f salsa salsa:perl-team/modules/packages/libapi-gitforge-perl ||:
     git branch --track debian salsa/master
-    git config branch.debian.signOffOptional true
 skip = lazy
 
 [src/org-d20]
@@ -422,14 +400,6 @@ post_checkout =
 fixups =
     git rev-parse "$hostname"@{upstream} >/dev/null 2>&1 \
         && git branch --unset-upstream "$hostname"
-    git config branch.master.rebase true
-    git config branch."$hostname".rebase true
-    git config branch.deb/emacs/d/sid/master.dpmUpstreamBranch deb/emacs/d/sid/upstream
-    git config branch.deb/emacs/d/sid/master.dpmPatchedBranch deb/emacs/d/sid/patched
-    git config branch.deb/emacs-non-dfsg/d/sid/master.dpmUpstreamBranch \
-    	deb/emacs-non-dfsg/d/sid/upstream
-    git config branch.deb/emacs-non-dfsg/d/sid/master.dpmPatchedBranch \
-    	deb/emacs-non-dfsg/d/sid/patched
 # We don't have the "$(hostname -s)" branch's upstream set to origin/master to
 # avoid accidentally pushing personal commits to Savannah (push.default cannot
 # help here).  So for convenient updates of "$(hostname -s)" to its conceptual
@@ -487,7 +457,6 @@ skip = lazy
 
 [src/notmuch]
 checkout = git clone 'https://git.notmuchmail.org/git/notmuch' 'notmuch'
-fixups = git config --local sendemail.to notmuch@notmuchmail.org
 skip = lazy
 
 [src/linux]
@@ -523,16 +492,6 @@ update = git annex sync --no-content origin
 # disabled because required yubikey
 # sync = git annex sync --no-content origin
 push = git annex sync --content origin athena
-fixups =
-    git config push.default matching
-    git config remote.origin.gcrypt-publish-participants true
-    git config remote.origin.gcrypt-participants 0x0F56D0553B6D411B
-    # git config gcrypt.publish-participants true
-    # git config gcrypt.participants 0x0F56D0553B6D411B
-    git config annex.startupscan false
-    git config annex.autocommit true # needed for `git annex sync`
-    git config remote.origin.annex-ignore true
-    git config unpushed-tags.ignore true
 
 [annex]
 checkout = git clone athenag:annex19.git annex
@@ -545,15 +504,6 @@ post_checkout =
     git annex init
     git annex enableremote cloud
 
-fixups =
-    git config push.default nothing
-    git config remote.origin.gcrypt-publish-participants true
-    git config remote.origin.gcrypt-participants 0x0F56D0553B6D411B
-    git config annex.startupscan false
-    git config annex.autocommit true # needed for `git annex sync`
-    git config remote.origin.annex-ignore true
-    git config unpushed-tags.ignore true
-
 # --- personal website big files annex
 
 [lib/wikiannex]
@@ -561,8 +511,6 @@ checkout = git clone demeter:wikiannex.git
 post_checkout =
     cd wikiannex
     git annex init
-    git config remote.origin.annex-ignore false
-    # ^ the git-annex-init sets this wrong
 
     # if workstation; then
     #     git remote add bkupsd /media/${USER}/bkupsd/git/demeter/wikiannex.git
@@ -572,7 +520,6 @@ update = git annex sync --no-content
 push = git annex sync --content
 skip = lazy
 fixups =
-    git config unpushed-tags.ignore true
     if [ "$(hostname -s)" = "demeter" ]; then
         git annex adjust --hide-missing --unlock
     fi
@@ -586,16 +533,6 @@ post_checkout =
     git annex init
 update = ./update-and-sync
 push = git annex --no-content sync
-# 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'.
-fixups =
-    git config push.default matching
-    git config annex.startupscan false
-    git config annex.autocommit true # needed for ga sync
-    git config remote.origin.annex-ignore true
-    git config annex.genmetadata true
 skip = lazy
 
 # --- git annex for use with rtorrent
@@ -653,16 +590,6 @@ push =
     git annex sync origin
     ssh demeter find /srv/www/debian -type f -exec chmod 644 '{}' +
     ssh demeter find /srv/www/debian -type d -exec chmod 755 '{}' +
-fixups =
-    git config push.default matching
-    git config annex.startupscan false
-    git config annex.autocommit true # needed for `git annex sync`
-    git config remote.origin.annex-ignore true
-    git config annex.thin true
-    git config annex.addunlocked true
-    git config mrrepo.review-unused false
-    git config remote.demeter.annex-tracking-branch master
-    git config unpushed-tags.ignore true
 
 # The git-diff-files(1) call in ~/bin/git-is-clean fails in v7
 # git-annex repos with unlocked empty files, which this repo often
@@ -696,8 +623,6 @@ autoci = doccheckin || true
 # quick syncs
 sync = doccheckin && git pull --no-edit && git push
 
-fixups = git config branch.master.rebase false
-
 # --- static websites on web host boxes
 
 [public_html]