The receive.denyCurrentBranch config option controls what happens if you push to a branch that is checkout into a non-bare repository. By default, it rejects it. It can be disabled via ignore or warn. Another yet trickier option is updateInstead. When receive.denyCurrentBranch is set to updateInstead, a push that tries to update the branch that is currently checked out is accepted only when the index and the working tree exactly matches the currently checked out commit, in which case the index and the working tree are updated to match the pushed commit. Otherwise, the push is refused. However, this setting was forgotten when the git worktree command was introduced: only the main worktree's current branch is respected. [ fixes: #331 ] Incidently, this change also fixes another bug i.e. receive.denyCurrentBranch = true was ignored when pushing into a non-bare repository using ref namespaces. Thanks, @dscho for helping me out. Regards, Hariom Hariom Verma (3): get_main_worktree(): allow it to be called in the Git directory t5509: use a bare repository for test push target receive.denyCurrentBranch: respect all worktrees builtin/receive-pack.c | 37 +++++++++++++++++--------------- t/t5509-fetch-push-namespaces.sh | 13 ++++++++++- t/t5516-fetch-push.sh | 11 ++++++++++ worktree.c | 1 + 4 files changed, 44 insertions(+), 18 deletions(-) base-commit: 232378479ee6c66206d47a9be175e3a39682aea6 Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-535%2Fharry-hov%2Fdeny-v3 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-535/harry-hov/deny-v3 Pull-Request: https://github.com/gitgitgadget/git/pull/535 Range-diff vs v2: 1: 8718facbc95 = 1: 8718facbc95 get_main_worktree(): allow it to be called in the Git directory 2: 5c749e044a3 ! 2: ae749310f06 t5509: initialized `pushee` as bare repository @@ -1,6 +1,6 @@ Author: Hariom Verma <hariom18599@xxxxxxxxx> - t5509: initialized `pushee` as bare repository + t5509: use a bare repository for test push target `receive.denyCurrentBranch` currently has a bug where it allows pushing into non-bare repository using namespaces as long as it does not have any 3: b3e573d44a9 < -: ----------- bug: denyCurrentBranch and unborn branch with ref namespace 4: 61e5f75a6f9 ! 3: d21a590d6c2 receive.denyCurrentBranch: respect all worktrees @@ -134,11 +134,18 @@ test_cmp expect actual ' --test_expect_failure 'denyCurrentBranch and unborn branch with ref namespace' ' +test_expect_success 'denyCurrentBranch and unborn branch with ref namespace' ' - cd original && - git init unborn && - git remote add unborn-namespaced "ext::git --namespace=namespace %s unborn" && ++ ( ++ cd original && ++ git init unborn && ++ git remote add unborn-namespaced "ext::git --namespace=namespace %s unborn" && ++ test_must_fail git push unborn-namespaced HEAD:master && ++ git -C unborn config receive.denyCurrentBranch updateInstead && ++ git push unborn-namespaced HEAD:master ++ ) ++' ++ + test_done diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh --- a/t/t5516-fetch-push.sh -- gitgitgadget
