mirror of
https://github.com/git/git
synced 2024-10-30 04:01:21 +00:00
4ef346482d
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>
166 lines
5.8 KiB
Bash
Executable file
166 lines
5.8 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='fetch/push involving ref namespaces'
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success setup '
|
|
git config --global protocol.ext.allow user &&
|
|
test_tick &&
|
|
git init original &&
|
|
(
|
|
cd original &&
|
|
echo 0 >count &&
|
|
git add count &&
|
|
test_commit 0 &&
|
|
echo 1 >count &&
|
|
git add count &&
|
|
test_commit 1 &&
|
|
git remote add pushee-namespaced "ext::git --namespace=namespace %s ../pushee" &&
|
|
git remote add pushee-unnamespaced ../pushee
|
|
) &&
|
|
commit0=$(cd original && git rev-parse HEAD^) &&
|
|
commit1=$(cd original && git rev-parse HEAD) &&
|
|
git init --bare pushee &&
|
|
git init puller
|
|
'
|
|
|
|
test_expect_success 'pushing into a repository using a ref namespace' '
|
|
(
|
|
cd original &&
|
|
git push pushee-namespaced master &&
|
|
git ls-remote pushee-namespaced >actual &&
|
|
printf "$commit1\trefs/heads/master\n" >expected &&
|
|
test_cmp expected actual &&
|
|
git push pushee-namespaced --tags &&
|
|
git ls-remote pushee-namespaced >actual &&
|
|
printf "$commit0\trefs/tags/0\n" >>expected &&
|
|
printf "$commit1\trefs/tags/1\n" >>expected &&
|
|
test_cmp expected actual &&
|
|
# Verify that the GIT_NAMESPACE environment variable works as well
|
|
GIT_NAMESPACE=namespace git ls-remote "ext::git %s ../pushee" >actual &&
|
|
test_cmp expected actual &&
|
|
# Verify that --namespace overrides GIT_NAMESPACE
|
|
GIT_NAMESPACE=garbage git ls-remote pushee-namespaced >actual &&
|
|
test_cmp expected actual &&
|
|
# Try a namespace with no content
|
|
git ls-remote "ext::git --namespace=garbage %s ../pushee" >actual &&
|
|
test_must_be_empty actual &&
|
|
git ls-remote pushee-unnamespaced >actual &&
|
|
sed -e "s|refs/|refs/namespaces/namespace/refs/|" expected >expected.unnamespaced &&
|
|
test_cmp expected.unnamespaced actual
|
|
)
|
|
'
|
|
|
|
test_expect_success 'pulling from a repository using a ref namespace' '
|
|
(
|
|
cd puller &&
|
|
git remote add -f pushee-namespaced "ext::git --namespace=namespace %s ../pushee" &&
|
|
git for-each-ref refs/ >actual &&
|
|
printf "$commit1 commit\trefs/remotes/pushee-namespaced/master\n" >expected &&
|
|
printf "$commit0 commit\trefs/tags/0\n" >>expected &&
|
|
printf "$commit1 commit\trefs/tags/1\n" >>expected &&
|
|
test_cmp expected actual
|
|
)
|
|
'
|
|
|
|
# This test with clone --mirror checks for possible regressions in clone
|
|
# or the machinery underneath it. It ensures that no future change
|
|
# causes clone to ignore refs in refs/namespaces/*. In particular, it
|
|
# protects against a regression caused by any future change to the refs
|
|
# machinery that might cause it to ignore refs outside of refs/heads/*
|
|
# or refs/tags/*. More generally, this test also checks the high-level
|
|
# functionality of using clone --mirror to back up a set of repos hosted
|
|
# in the namespaces of a single repo.
|
|
test_expect_success 'mirroring a repository using a ref namespace' '
|
|
git clone --mirror pushee mirror &&
|
|
(
|
|
cd mirror &&
|
|
git for-each-ref refs/ >actual &&
|
|
printf "$commit1 commit\trefs/namespaces/namespace/refs/heads/master\n" >expected &&
|
|
printf "$commit0 commit\trefs/namespaces/namespace/refs/tags/0\n" >>expected &&
|
|
printf "$commit1 commit\trefs/namespaces/namespace/refs/tags/1\n" >>expected &&
|
|
test_cmp expected actual
|
|
)
|
|
'
|
|
|
|
test_expect_success 'hide namespaced refs with transfer.hideRefs' '
|
|
GIT_NAMESPACE=namespace \
|
|
git -C pushee -c transfer.hideRefs=refs/tags \
|
|
ls-remote "ext::git %s ." >actual &&
|
|
printf "$commit1\trefs/heads/master\n" >expected &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'check that transfer.hideRefs does not match unstripped refs' '
|
|
GIT_NAMESPACE=namespace \
|
|
git -C pushee -c transfer.hideRefs=refs/namespaces/namespace/refs/tags \
|
|
ls-remote "ext::git %s ." >actual &&
|
|
printf "$commit1\trefs/heads/master\n" >expected &&
|
|
printf "$commit0\trefs/tags/0\n" >>expected &&
|
|
printf "$commit1\trefs/tags/1\n" >>expected &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'hide full refs with transfer.hideRefs' '
|
|
GIT_NAMESPACE=namespace \
|
|
git -C pushee -c transfer.hideRefs="^refs/namespaces/namespace/refs/tags" \
|
|
ls-remote "ext::git %s ." >actual &&
|
|
printf "$commit1\trefs/heads/master\n" >expected &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'try to update a hidden ref' '
|
|
test_config -C pushee transfer.hideRefs refs/heads/master &&
|
|
test_must_fail git -C original push pushee-namespaced master
|
|
'
|
|
|
|
test_expect_success 'try to update a ref that is not hidden' '
|
|
test_config -C pushee transfer.hideRefs refs/namespaces/namespace/refs/heads/master &&
|
|
git -C original push pushee-namespaced master
|
|
'
|
|
|
|
test_expect_success 'try to update a hidden full ref' '
|
|
test_config -C pushee transfer.hideRefs "^refs/namespaces/namespace/refs/heads/master" &&
|
|
test_must_fail git -C original push pushee-namespaced master
|
|
'
|
|
|
|
test_expect_success 'set up ambiguous HEAD' '
|
|
git init ambiguous &&
|
|
(
|
|
cd ambiguous &&
|
|
git commit --allow-empty -m foo &&
|
|
git update-ref refs/namespaces/ns/refs/heads/one HEAD &&
|
|
git update-ref refs/namespaces/ns/refs/heads/two HEAD &&
|
|
git symbolic-ref refs/namespaces/ns/HEAD \
|
|
refs/namespaces/ns/refs/heads/two
|
|
)
|
|
'
|
|
|
|
test_expect_success 'clone chooses correct HEAD (v0)' '
|
|
GIT_NAMESPACE=ns git -c protocol.version=0 \
|
|
clone ambiguous ambiguous-v0 &&
|
|
echo refs/heads/two >expect &&
|
|
git -C ambiguous-v0 symbolic-ref HEAD >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'clone chooses correct HEAD (v2)' '
|
|
GIT_NAMESPACE=ns git -c protocol.version=2 \
|
|
clone ambiguous ambiguous-v2 &&
|
|
echo refs/heads/two >expect &&
|
|
git -C ambiguous-v2 symbolic-ref HEAD >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
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" &&
|
|
test_must_fail git push unborn-namespaced HEAD:master &&
|
|
git -C unborn config receive.denyCurrentBranch updateInstead &&
|
|
git push unborn-namespaced HEAD:master
|
|
)
|
|
'
|
|
|
|
test_done
|