]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ak/protect-any-current-branch'
authorJunio C Hamano <gitster@pobox.com>
Tue, 21 Dec 2021 23:03:16 +0000 (15:03 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 21 Dec 2021 23:03:16 +0000 (15:03 -0800)
"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

1  2 
builtin/notes.c
builtin/receive-pack.c
t/t5516-fetch-push.sh

diff --cc builtin/notes.c
Simple merge
Simple merge
Simple merge