]> git.ipfire.org Git - thirdparty/git.git/commit - t/t5509-fetch-push-namespaces.sh
receive.denyCurrentBranch: respect all worktrees
authorHariom Verma <hariom18599@gmail.com>
Sun, 23 Feb 2020 18:57:10 +0000 (18:57 +0000)
committerJunio C Hamano <gitster@pobox.com>
Mon, 24 Feb 2020 19:14:43 +0000 (11:14 -0800)
commit4ef346482d6d5748861c1aa9d56712e847369b40
tree074ab774624ffb5f5d2ab6c8f4e28a2cbb1565c6
parentf8692114dbb1b3ffe0b71871a015c632c195b784
receive.denyCurrentBranch: respect all worktrees

The receive.denyCurrentBranch config option controls what happens if
you push to a branch that is checked out into a non-bare repository.
By default, it rejects it. It can be disabled via `ignore` or `warn`.
Another yet trickier option is `updateInstead`.

However, this setting was forgotten when the git worktree command was
introduced: only the main worktree's current branch is respected.

With this change, all worktrees are respected.

That change also leads to revealing another bug,
i.e. `receive.denyCurrentBranch = true` was ignored when pushing into a
non-bare repository's unborn current branch using ref namespaces. As
`is_ref_checked_out()` returns 0 which means `receive-pack` does not get
into conditional statement to switch `deny_current_branch` accordingly
(ignore, warn, refuse, unconfigured, updateInstead).

receive.denyCurrentBranch uses the function `refs_resolve_ref_unsafe()`
(called via `resolve_refdup()`) to resolve the symbolic ref HEAD, but
that function fails when HEAD does not point at a valid commit.
As we replace the call to `refs_resolve_ref_unsafe()` with
`find_shared_symref()`, which has no problem finding the worktree for a
given branch even if it is unborn yet, this bug is fixed at the same
time: receive.denyCurrentBranch now also handles worktrees with unborn
branches as intended even while using ref namespaces.

Helped-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Hariom Verma <hariom18599@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/receive-pack.c
t/t5509-fetch-push-namespaces.sh
t/t5516-fetch-push.sh