From: Junio C Hamano Date: Thu, 5 Mar 2020 18:43:02 +0000 (-0800) Subject: Merge branch 'hv/receive-denycurrent-everywhere' X-Git-Tag: v2.26.0-rc0~10 X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fgit.git;a=commitdiff_plain;h=4a2e91db652e197803c6f29e2c2f1c9dfbc16506 Merge branch 'hv/receive-denycurrent-everywhere' "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 --- 4a2e91db652e197803c6f29e2c2f1c9dfbc16506