mirror of
https://github.com/git/git.git
synced 2024-11-28 04:23:30 +08:00
2e03115d0c
The --prefetch option will be used by the 'prefetch' maintenance task instead of sending refspecs explicitly across the command-line. The intention is to modify the refspec to place all results in refs/prefetch/ instead of anywhere else. Create helper method filter_prefetch_refspec() to modify a given refspec to fit the rules expected of the prefetch task: * Negative refspecs are preserved. * Refspecs without a destination are removed. * Refspecs whose source starts with "refs/tags/" are removed. * Other refspecs are placed within "refs/prefetch/". Finally, we add the 'force' option to ensure that prefetch refs are replaced as necessary. There are some interesting cases that are worth testing. An earlier version of this change dropped the "i--" from the loop that deletes a refspec item and shifts the remaining entries down. This allowed some refspecs to not be modified. The subtle part about the first --prefetch test is that the "refs/tags/*" refspec appears directly before the "refs/heads/bogus/*" refspec. Without that "i--", this ordering would remove the "refs/tags/*" refspec and leave the last one unmodified, placing the result in "refs/heads/*". It is possible to have an empty refspec. This is typically the case for remotes other than the origin, where users want to fetch a specific tag or branch. To correctly test this case, we need to further remove the upstream remote for the local branch. Thus, we are testing a refspec that will be deleted, leaving nothing to fetch. Helped-by: Tom Saeger <tom.saeger@oracle.com> Helped-by: Ramsay Jones <ramsay@ramsayjones.plus.com> Signed-off-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
287 lines
8.6 KiB
Bash
Executable File
287 lines
8.6 KiB
Bash
Executable File
#!/bin/sh
|
|
# Copyright (c) 2020, Jacob Keller.
|
|
|
|
test_description='"git fetch" with negative refspecs.
|
|
|
|
'
|
|
|
|
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
|
|
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success setup '
|
|
echo >file original &&
|
|
git add file &&
|
|
git commit -a -m original
|
|
'
|
|
|
|
test_expect_success "clone and setup child repos" '
|
|
git clone . one &&
|
|
(
|
|
cd one &&
|
|
echo >file updated by one &&
|
|
git commit -a -m "updated by one" &&
|
|
git switch -c alternate &&
|
|
echo >file updated again by one &&
|
|
git commit -a -m "updated by one again" &&
|
|
git switch main
|
|
) &&
|
|
git clone . two &&
|
|
(
|
|
cd two &&
|
|
git config branch.main.remote one &&
|
|
git config remote.one.url ../one/.git/ &&
|
|
git config remote.one.fetch +refs/heads/*:refs/remotes/one/* &&
|
|
git config --add remote.one.fetch ^refs/heads/alternate
|
|
) &&
|
|
git clone . three
|
|
'
|
|
|
|
test_expect_success "fetch one" '
|
|
echo >file updated by origin &&
|
|
git commit -a -m "updated by origin" &&
|
|
(
|
|
cd two &&
|
|
test_must_fail git rev-parse --verify refs/remotes/one/alternate &&
|
|
git fetch one &&
|
|
test_must_fail git rev-parse --verify refs/remotes/one/alternate &&
|
|
git rev-parse --verify refs/remotes/one/main &&
|
|
mine=$(git rev-parse refs/remotes/one/main) &&
|
|
his=$(cd ../one && git rev-parse refs/heads/main) &&
|
|
test "z$mine" = "z$his"
|
|
)
|
|
'
|
|
|
|
test_expect_success "fetch with negative refspec on commandline" '
|
|
echo >file updated by origin again &&
|
|
git commit -a -m "updated by origin again" &&
|
|
(
|
|
cd three &&
|
|
alternate_in_one=$(cd ../one && git rev-parse refs/heads/alternate) &&
|
|
echo $alternate_in_one >expect &&
|
|
git fetch ../one/.git refs/heads/*:refs/remotes/one/* ^refs/heads/main &&
|
|
cut -f -1 .git/FETCH_HEAD >actual &&
|
|
test_cmp expect actual
|
|
)
|
|
'
|
|
|
|
test_expect_success "fetch with negative sha1 refspec fails" '
|
|
echo >file updated by origin yet again &&
|
|
git commit -a -m "updated by origin yet again" &&
|
|
(
|
|
cd three &&
|
|
main_in_one=$(cd ../one && git rev-parse refs/heads/main) &&
|
|
test_must_fail git fetch ../one/.git refs/heads/*:refs/remotes/one/* ^$main_in_one
|
|
)
|
|
'
|
|
|
|
test_expect_success "fetch with negative pattern refspec" '
|
|
echo >file updated by origin once more &&
|
|
git commit -a -m "updated by origin once more" &&
|
|
(
|
|
cd three &&
|
|
alternate_in_one=$(cd ../one && git rev-parse refs/heads/alternate) &&
|
|
echo $alternate_in_one >expect &&
|
|
git fetch ../one/.git refs/heads/*:refs/remotes/one/* ^refs/heads/m* &&
|
|
cut -f -1 .git/FETCH_HEAD >actual &&
|
|
test_cmp expect actual
|
|
)
|
|
'
|
|
|
|
test_expect_success "fetch with negative pattern refspec does not expand prefix" '
|
|
echo >file updated by origin another time &&
|
|
git commit -a -m "updated by origin another time" &&
|
|
(
|
|
cd three &&
|
|
alternate_in_one=$(cd ../one && git rev-parse refs/heads/alternate) &&
|
|
main_in_one=$(cd ../one && git rev-parse refs/heads/main) &&
|
|
echo $alternate_in_one >expect &&
|
|
echo $main_in_one >>expect &&
|
|
git fetch ../one/.git refs/heads/*:refs/remotes/one/* ^main &&
|
|
cut -f -1 .git/FETCH_HEAD >actual &&
|
|
test_cmp expect actual
|
|
)
|
|
'
|
|
|
|
test_expect_success "fetch with negative refspec avoids duplicate conflict" '
|
|
cd "$D" &&
|
|
(
|
|
cd one &&
|
|
git branch dups/a &&
|
|
git branch dups/b &&
|
|
git branch dups/c &&
|
|
git branch other/a &&
|
|
git rev-parse --verify refs/heads/other/a >../expect &&
|
|
git rev-parse --verify refs/heads/dups/b >>../expect &&
|
|
git rev-parse --verify refs/heads/dups/c >>../expect
|
|
) &&
|
|
(
|
|
cd three &&
|
|
git fetch ../one/.git ^refs/heads/dups/a refs/heads/dups/*:refs/dups/* refs/heads/other/a:refs/dups/a &&
|
|
git rev-parse --verify refs/dups/a >../actual &&
|
|
git rev-parse --verify refs/dups/b >>../actual &&
|
|
git rev-parse --verify refs/dups/c >>../actual
|
|
) &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success "push --prune with negative refspec" '
|
|
(
|
|
cd two &&
|
|
git branch prune/a &&
|
|
git branch prune/b &&
|
|
git branch prune/c &&
|
|
git push ../three refs/heads/prune/* &&
|
|
git branch -d prune/a &&
|
|
git branch -d prune/b &&
|
|
git push --prune ../three refs/heads/prune/* ^refs/heads/prune/b
|
|
) &&
|
|
(
|
|
cd three &&
|
|
test_write_lines b c >expect &&
|
|
git for-each-ref --format="%(refname:lstrip=3)" refs/heads/prune/ >actual &&
|
|
test_cmp expect actual
|
|
)
|
|
'
|
|
|
|
test_expect_success "push --prune with negative refspec apply to the destination" '
|
|
(
|
|
cd two &&
|
|
git branch ours/a &&
|
|
git branch ours/b &&
|
|
git branch ours/c &&
|
|
git push ../three refs/heads/ours/*:refs/heads/theirs/* &&
|
|
git branch -d ours/a &&
|
|
git branch -d ours/b &&
|
|
git push --prune ../three refs/heads/ours/*:refs/heads/theirs/* ^refs/heads/theirs/b
|
|
) &&
|
|
(
|
|
cd three &&
|
|
test_write_lines b c >expect &&
|
|
git for-each-ref --format="%(refname:lstrip=3)" refs/heads/theirs/ >actual &&
|
|
test_cmp expect actual
|
|
)
|
|
'
|
|
|
|
test_expect_success "fetch --prune with negative refspec" '
|
|
(
|
|
cd two &&
|
|
git branch fetch/a &&
|
|
git branch fetch/b &&
|
|
git branch fetch/c
|
|
) &&
|
|
(
|
|
cd three &&
|
|
git fetch ../two/.git refs/heads/fetch/*:refs/heads/copied/*
|
|
) &&
|
|
(
|
|
cd two &&
|
|
git branch -d fetch/a &&
|
|
git branch -d fetch/b
|
|
) &&
|
|
(
|
|
cd three &&
|
|
test_write_lines b c >expect &&
|
|
git fetch -v ../two/.git --prune refs/heads/fetch/*:refs/heads/copied/* ^refs/heads/fetch/b &&
|
|
git for-each-ref --format="%(refname:lstrip=3)" refs/heads/copied/ >actual &&
|
|
test_cmp expect actual
|
|
)
|
|
'
|
|
|
|
test_expect_success "push with matching : and negative refspec" '
|
|
# Manually handle cleanup, since test_config is not
|
|
# prepared to take arbitrary options like --add
|
|
test_when_finished "test_unconfig -C two remote.one.push" &&
|
|
|
|
# For convenience, we use "master" to refer to the name of
|
|
# the branch created by default in the following.
|
|
#
|
|
# Repositories two and one have branches other than "master"
|
|
# but they have no overlap---"master" is the only one that
|
|
# is shared between them. And the master branch at two is
|
|
# behind the master branch at one by one commit.
|
|
git -C two config --add remote.one.push : &&
|
|
|
|
# A matching push tries to update master, fails due to non-ff
|
|
test_must_fail git -C two push one &&
|
|
|
|
# "master" may actually not be "master"---find it out.
|
|
current=$(git symbolic-ref HEAD) &&
|
|
|
|
# If master is in negative refspec, then the command will not attempt
|
|
# to push and succeed.
|
|
git -C two config --add remote.one.push "^$current" &&
|
|
|
|
# With "master" excluded, this push is a no-op. Nothing gets
|
|
# pushed and it succeeds.
|
|
git -C two push -v one
|
|
'
|
|
|
|
test_expect_success "push with matching +: and negative refspec" '
|
|
test_when_finished "test_unconfig -C two remote.one.push" &&
|
|
|
|
# The same set-up as above, whose side-effect was a no-op.
|
|
git -C two config --add remote.one.push +: &&
|
|
|
|
# The push refuses to update the "master" branch that is checked
|
|
# out in the "one" repository, even when it is forced with +:
|
|
test_must_fail git -C two push one &&
|
|
|
|
# "master" may actually not be "master"---find it out.
|
|
current=$(git symbolic-ref HEAD) &&
|
|
|
|
# If master is in negative refspec, then the command will not attempt
|
|
# to push and succeed
|
|
git -C two config --add remote.one.push "^$current" &&
|
|
|
|
# With "master" excluded, this push is a no-op. Nothing gets
|
|
# pushed and it succeeds.
|
|
git -C two push -v one
|
|
'
|
|
|
|
test_expect_success '--prefetch correctly modifies refspecs' '
|
|
git -C one config --unset-all remote.origin.fetch &&
|
|
git -C one config --add remote.origin.fetch ^refs/heads/bogus/ignore &&
|
|
git -C one config --add remote.origin.fetch "refs/tags/*:refs/tags/*" &&
|
|
git -C one config --add remote.origin.fetch "refs/heads/bogus/*:bogus/*" &&
|
|
|
|
git tag -a -m never never-fetch-tag HEAD &&
|
|
|
|
git branch bogus/fetched HEAD~1 &&
|
|
git branch bogus/ignore HEAD &&
|
|
|
|
git -C one fetch --prefetch --no-tags &&
|
|
test_must_fail git -C one rev-parse never-fetch-tag &&
|
|
git -C one rev-parse refs/prefetch/bogus/fetched &&
|
|
test_must_fail git -C one rev-parse refs/prefetch/bogus/ignore &&
|
|
|
|
# correctly handle when refspec set becomes empty
|
|
# after removing the refs/tags/* refspec.
|
|
git -C one config --unset-all remote.origin.fetch &&
|
|
git -C one config --add remote.origin.fetch "refs/tags/*:refs/tags/*" &&
|
|
|
|
git -C one fetch --prefetch --no-tags &&
|
|
test_must_fail git -C one rev-parse never-fetch-tag &&
|
|
|
|
# The refspec for refs that are not fully qualified
|
|
# are filtered multiple times.
|
|
git -C one rev-parse refs/prefetch/bogus/fetched &&
|
|
test_must_fail git -C one rev-parse refs/prefetch/bogus/ignore
|
|
'
|
|
|
|
test_expect_success '--prefetch succeeds when refspec becomes empty' '
|
|
git checkout bogus/fetched &&
|
|
test_commit extra &&
|
|
|
|
git -C one config --unset-all remote.origin.fetch &&
|
|
git -C one config --unset branch.main.remote &&
|
|
git -C one config remote.origin.fetch "+refs/tags/extra" &&
|
|
git -C one config remote.origin.skipfetchall true &&
|
|
git -C one config remote.origin.tagopt "--no-tags" &&
|
|
|
|
git -C one fetch --prefetch
|
|
'
|
|
|
|
test_done
|