]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'hv/receive-denycurrent-everywhere'
authorJunio C Hamano <gitster@pobox.com>
Thu, 5 Mar 2020 18:43:02 +0000 (10:43 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 5 Mar 2020 18:43:03 +0000 (10:43 -0800)
"git push" should stop from updating a branch that is checked out
when receive.denyCurrentBranch configuration is set, but it failed
to pay attention to checkouts in secondary worktrees.  This has
been corrected.

* hv/receive-denycurrent-everywhere:
  t2402: test worktree path when called in .git directory
  receive.denyCurrentBranch: respect all worktrees
  t5509: use a bare repository for test push target
  get_main_worktree(): allow it to be called in the Git directory

1  2 
t/t5516-fetch-push.sh
worktree.c

Simple merge
diff --cc worktree.c
Simple merge