jonny/dotfiles
Watch
1
0
Fork
You've already forked dotfiles
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move git identity to an included ~/.gitconfig.local

Browse source 
~/.extra ran five `git config --global` writes on every shell startup, to
re-assert identity and signing after bootstrap.sh copies gitconfig over
~/.gitconfig. The dark-mode-notify agent fires on wake/unlock and runs
`pkill -usr1 zsh`, so every shell re-sources .zshrc — and therefore .extra —
simultaneously. `git config` locks with O_EXCL and has no retry or timeout for
config files, so the concurrent writes raced and printed:

    error: could not lock config file /Users/jonny/.gitconfig: File exists

Identity and signing now live in an untracked ~/.gitconfig.local, included
last from gitconfig so it wins over anything above. bootstrap.sh seeds it from
gitconfig.local.template only when absent, so re-runs never clobber the real
signing key. No git writes happen on shell startup at all now.

Verified: fully-resolved config is unchanged apart from the new include.path;
author and committer both resolve from config with no GIT_* env vars set;
existing commits still verify. 12 concurrent sources of .extra are silent,
where the old version produced 27 lock errors.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
This commit is contained in:
Jonny Barnes 2026-08-09 09:57:19 +01:00
commit 583bbaa533
No known key found for this signature in database
3 changed files with 39 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
bootstrap.sh
View file

@ -48,10 +48,19 @@ test -L $HOME/.config/nvim/lsp/phpactor.lua || ln -f -s $BASEDIR/neovim/lsp/phpa
test -d $HOME/.claude || mkdir $HOME/.claude
ln -f -s $BASEDIR/claude/statusline.isaacaudet.sh $HOME/.claude/statusline.sh
# .gitconfig gets edited by .extra so we won't symlink it, but copy it
# Copy rather than symlink, so an ad-hoc `git config --global` writes to $HOME
# and not into the repo.
echo "For compatibility we shall copy the global gitconfig"
cp $BASEDIR/gitconfig $HOME/.gitconfig
# Identity and signing live in ~/.gitconfig.local, which the above includes.
# It is per-machine and untracked, so seed it from the template. Never
# overwrite an existing one: it holds the real signing key.
test -e $HOME/.gitconfig.local || {
echo "Seeding ~/.gitconfig.local from template — fill in your identity"
cp $BASEDIR/gitconfig.local.template $HOME/.gitconfig.local
}
# Copy the progs into the local bin dir
rsync -av --chmod=+x $BASEDIR/bin/ $HOME/.local/bin/