Merge branch 'ak/protect-any-current-branch'
commit13fa77b6899d0068303761c449d9a7e01dd85eb8
authorJunio C Hamano <gitster@pobox.com>
Tue, 21 Dec 2021 23:03:16 +0000 (21 15:03 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 21 Dec 2021 23:03:16 +0000 (21 15:03 -0800)
treeb15e735aa90f701444aaa66ab080695f10a85549
parentee1dc493d10d814ceba1a551d9a185b9da627ad8
parent593a2a5d0639b4b4f91ff6e6ffb64e72020f8fd8
Merge branch 'ak/protect-any-current-branch'

"git fetch" without the "--update-head-ok" option ought to protect
a checked out branch from getting updated, to prevent the working
tree that checks it out to go out of sync.  The code was written
before the use of "git worktree" got widespread, and only checked
the branch that was checked out in the current worktree, which has
been updated.
(originally called ak/fetch-not-overwrite-any-current-branch)

* ak/protect-any-current-branch:
  branch: protect branches checked out in all worktrees
  receive-pack: protect current branch for bare repository worktree
  receive-pack: clean dead code from update_worktree()
  fetch: protect branches checked out in all worktrees
  worktree: simplify find_shared_symref() memory ownership model
  branch: lowercase error messages
  receive-pack: lowercase error messages
  fetch: lowercase error messages
builtin/notes.c
builtin/receive-pack.c
t/t5516-fetch-push.sh