refspec: add support for negative refspecs
Both fetch and push support pattern refspecs which allow fetching or
pushing references that match a specific pattern. Because these patterns
are globs, they have somewhat limited ability to express more complex
situations.
For example, suppose you wish to fetch all branches from a remote except
for a specific one. To allow this, you must setup a set of refspecs
which match only the branches you want. Because refspecs are either
explicit name matches, or simple globs, many patterns cannot be
expressed.
Add support for a new type of refspec, referred to as "negative"
refspecs. These are prefixed with a '^' and mean "exclude any ref
matching this refspec". They can only have one "side" which always
refers to the source. During a fetch, this refers to the name of the ref
on the remote. During a push, this refers to the name of the ref on the
local side.
With negative refspecs, users can express more complex patterns. For
example:
git fetch origin refs/heads/*:refs/remotes/origin/* ^refs/heads/dontwant
will fetch all branches on origin into remotes/origin, but will exclude
fetching the branch named dontwant.
Refspecs today are commutative, meaning that order doesn't expressly
matter. Rather than forcing an implied order, negative refspecs will
always be applied last. That is, in order to match, a ref must match at
least one positive refspec, and match none of the negative refspecs.
This is similar to how negative pathspecs work.
Signed-off-by: Jacob Keller <jacob.keller@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-09-30 21:25:29 +00:00
|
|
|
#!/bin/sh
|
|
|
|
|
# Copyright (c) 2020, Jacob Keller.
|
|
|
|
|
|
|
|
|
|
test_description='"git fetch" with negative refspecs.
|
|
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
2020-11-18 23:44:34 +00:00
|
|
|
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
|
tests: mark tests relying on the current default for `init.defaultBranch`
In addition to the manual adjustment to let the `linux-gcc` CI job run
the test suite with `master` and then with `main`, this patch makes sure
that GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME is set in all test scripts
that currently rely on the initial branch name being `master by default.
To determine which test scripts to mark up, the first step was to
force-set the default branch name to `master` in
- all test scripts that contain the keyword `master`,
- t4211, which expects `t/t4211/history.export` with a hard-coded ref to
initialize the default branch,
- t5560 because it sources `t/t556x_common` which uses `master`,
- t8002 and t8012 because both source `t/annotate-tests.sh` which also
uses `master`)
This trick was performed by this command:
$ sed -i '/^ *\. \.\/\(test-lib\|lib-\(bash\|cvs\|git-svn\)\|gitweb-lib\)\.sh$/i\
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master\
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\
' $(git grep -l master t/t[0-9]*.sh) \
t/t4211*.sh t/t5560*.sh t/t8002*.sh t/t8012*.sh
After that, careful, manual inspection revealed that some of the test
scripts containing the needle `master` do not actually rely on a
specific default branch name: either they mention `master` only in a
comment, or they initialize that branch specificially, or they do not
actually refer to the current default branch. Therefore, the
aforementioned modification was undone in those test scripts thusly:
$ git checkout HEAD -- \
t/t0027-auto-crlf.sh t/t0060-path-utils.sh \
t/t1011-read-tree-sparse-checkout.sh \
t/t1305-config-include.sh t/t1309-early-config.sh \
t/t1402-check-ref-format.sh t/t1450-fsck.sh \
t/t2024-checkout-dwim.sh \
t/t2106-update-index-assume-unchanged.sh \
t/t3040-subprojects-basic.sh t/t3301-notes.sh \
t/t3308-notes-merge.sh t/t3423-rebase-reword.sh \
t/t3436-rebase-more-options.sh \
t/t4015-diff-whitespace.sh t/t4257-am-interactive.sh \
t/t5323-pack-redundant.sh t/t5401-update-hooks.sh \
t/t5511-refspec.sh t/t5526-fetch-submodules.sh \
t/t5529-push-errors.sh t/t5530-upload-pack-error.sh \
t/t5548-push-porcelain.sh \
t/t5552-skipping-fetch-negotiator.sh \
t/t5572-pull-submodule.sh t/t5608-clone-2gb.sh \
t/t5614-clone-submodules-shallow.sh \
t/t7508-status.sh t/t7606-merge-custom.sh \
t/t9302-fast-import-unpack-limit.sh
We excluded one set of test scripts in these commands, though: the range
of `git p4` tests. The reason? `git p4` stores the (foreign) remote
branch in the branch called `p4/master`, which is obviously not the
default branch. Manual analysis revealed that only five of these tests
actually require a specific default branch name to pass; They were
modified thusly:
$ sed -i '/^ *\. \.\/lib-git-p4\.sh$/i\
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master\
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\
' t/t980[0167]*.sh t/t9811*.sh
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-11-18 23:44:19 +00:00
|
|
|
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
|
|
|
|
|
refspec: add support for negative refspecs
Both fetch and push support pattern refspecs which allow fetching or
pushing references that match a specific pattern. Because these patterns
are globs, they have somewhat limited ability to express more complex
situations.
For example, suppose you wish to fetch all branches from a remote except
for a specific one. To allow this, you must setup a set of refspecs
which match only the branches you want. Because refspecs are either
explicit name matches, or simple globs, many patterns cannot be
expressed.
Add support for a new type of refspec, referred to as "negative"
refspecs. These are prefixed with a '^' and mean "exclude any ref
matching this refspec". They can only have one "side" which always
refers to the source. During a fetch, this refers to the name of the ref
on the remote. During a push, this refers to the name of the ref on the
local side.
With negative refspecs, users can express more complex patterns. For
example:
git fetch origin refs/heads/*:refs/remotes/origin/* ^refs/heads/dontwant
will fetch all branches on origin into remotes/origin, but will exclude
fetching the branch named dontwant.
Refspecs today are commutative, meaning that order doesn't expressly
matter. Rather than forcing an implied order, negative refspecs will
always be applied last. That is, in order to match, a ref must match at
least one positive refspec, and match none of the negative refspecs.
This is similar to how negative pathspecs work.
Signed-off-by: Jacob Keller <jacob.keller@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-09-30 21:25:29 +00:00
|
|
|
. ./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" &&
|
2020-11-18 23:44:34 +00:00
|
|
|
git switch main
|
refspec: add support for negative refspecs
Both fetch and push support pattern refspecs which allow fetching or
pushing references that match a specific pattern. Because these patterns
are globs, they have somewhat limited ability to express more complex
situations.
For example, suppose you wish to fetch all branches from a remote except
for a specific one. To allow this, you must setup a set of refspecs
which match only the branches you want. Because refspecs are either
explicit name matches, or simple globs, many patterns cannot be
expressed.
Add support for a new type of refspec, referred to as "negative"
refspecs. These are prefixed with a '^' and mean "exclude any ref
matching this refspec". They can only have one "side" which always
refers to the source. During a fetch, this refers to the name of the ref
on the remote. During a push, this refers to the name of the ref on the
local side.
With negative refspecs, users can express more complex patterns. For
example:
git fetch origin refs/heads/*:refs/remotes/origin/* ^refs/heads/dontwant
will fetch all branches on origin into remotes/origin, but will exclude
fetching the branch named dontwant.
Refspecs today are commutative, meaning that order doesn't expressly
matter. Rather than forcing an implied order, negative refspecs will
always be applied last. That is, in order to match, a ref must match at
least one positive refspec, and match none of the negative refspecs.
This is similar to how negative pathspecs work.
Signed-off-by: Jacob Keller <jacob.keller@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-09-30 21:25:29 +00:00
|
|
|
) &&
|
|
|
|
|
git clone . two &&
|
|
|
|
|
(
|
|
|
|
|
cd two &&
|
2020-11-18 23:44:34 +00:00
|
|
|
git config branch.main.remote one &&
|
refspec: add support for negative refspecs
Both fetch and push support pattern refspecs which allow fetching or
pushing references that match a specific pattern. Because these patterns
are globs, they have somewhat limited ability to express more complex
situations.
For example, suppose you wish to fetch all branches from a remote except
for a specific one. To allow this, you must setup a set of refspecs
which match only the branches you want. Because refspecs are either
explicit name matches, or simple globs, many patterns cannot be
expressed.
Add support for a new type of refspec, referred to as "negative"
refspecs. These are prefixed with a '^' and mean "exclude any ref
matching this refspec". They can only have one "side" which always
refers to the source. During a fetch, this refers to the name of the ref
on the remote. During a push, this refers to the name of the ref on the
local side.
With negative refspecs, users can express more complex patterns. For
example:
git fetch origin refs/heads/*:refs/remotes/origin/* ^refs/heads/dontwant
will fetch all branches on origin into remotes/origin, but will exclude
fetching the branch named dontwant.
Refspecs today are commutative, meaning that order doesn't expressly
matter. Rather than forcing an implied order, negative refspecs will
always be applied last. That is, in order to match, a ref must match at
least one positive refspec, and match none of the negative refspecs.
This is similar to how negative pathspecs work.
Signed-off-by: Jacob Keller <jacob.keller@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-09-30 21:25:29 +00:00
|
|
|
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 &&
|
2020-11-18 23:44:34 +00:00
|
|
|
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) &&
|
refspec: add support for negative refspecs
Both fetch and push support pattern refspecs which allow fetching or
pushing references that match a specific pattern. Because these patterns
are globs, they have somewhat limited ability to express more complex
situations.
For example, suppose you wish to fetch all branches from a remote except
for a specific one. To allow this, you must setup a set of refspecs
which match only the branches you want. Because refspecs are either
explicit name matches, or simple globs, many patterns cannot be
expressed.
Add support for a new type of refspec, referred to as "negative"
refspecs. These are prefixed with a '^' and mean "exclude any ref
matching this refspec". They can only have one "side" which always
refers to the source. During a fetch, this refers to the name of the ref
on the remote. During a push, this refers to the name of the ref on the
local side.
With negative refspecs, users can express more complex patterns. For
example:
git fetch origin refs/heads/*:refs/remotes/origin/* ^refs/heads/dontwant
will fetch all branches on origin into remotes/origin, but will exclude
fetching the branch named dontwant.
Refspecs today are commutative, meaning that order doesn't expressly
matter. Rather than forcing an implied order, negative refspecs will
always be applied last. That is, in order to match, a ref must match at
least one positive refspec, and match none of the negative refspecs.
This is similar to how negative pathspecs work.
Signed-off-by: Jacob Keller <jacob.keller@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-09-30 21:25:29 +00:00
|
|
|
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 &&
|
2020-11-18 23:44:34 +00:00
|
|
|
git fetch ../one/.git refs/heads/*:refs/remotes/one/* ^refs/heads/main &&
|
refspec: add support for negative refspecs
Both fetch and push support pattern refspecs which allow fetching or
pushing references that match a specific pattern. Because these patterns
are globs, they have somewhat limited ability to express more complex
situations.
For example, suppose you wish to fetch all branches from a remote except
for a specific one. To allow this, you must setup a set of refspecs
which match only the branches you want. Because refspecs are either
explicit name matches, or simple globs, many patterns cannot be
expressed.
Add support for a new type of refspec, referred to as "negative"
refspecs. These are prefixed with a '^' and mean "exclude any ref
matching this refspec". They can only have one "side" which always
refers to the source. During a fetch, this refers to the name of the ref
on the remote. During a push, this refers to the name of the ref on the
local side.
With negative refspecs, users can express more complex patterns. For
example:
git fetch origin refs/heads/*:refs/remotes/origin/* ^refs/heads/dontwant
will fetch all branches on origin into remotes/origin, but will exclude
fetching the branch named dontwant.
Refspecs today are commutative, meaning that order doesn't expressly
matter. Rather than forcing an implied order, negative refspecs will
always be applied last. That is, in order to match, a ref must match at
least one positive refspec, and match none of the negative refspecs.
This is similar to how negative pathspecs work.
Signed-off-by: Jacob Keller <jacob.keller@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-09-30 21:25:29 +00:00
|
|
|
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 &&
|
2020-11-18 23:44:34 +00:00
|
|
|
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
|
refspec: add support for negative refspecs
Both fetch and push support pattern refspecs which allow fetching or
pushing references that match a specific pattern. Because these patterns
are globs, they have somewhat limited ability to express more complex
situations.
For example, suppose you wish to fetch all branches from a remote except
for a specific one. To allow this, you must setup a set of refspecs
which match only the branches you want. Because refspecs are either
explicit name matches, or simple globs, many patterns cannot be
expressed.
Add support for a new type of refspec, referred to as "negative"
refspecs. These are prefixed with a '^' and mean "exclude any ref
matching this refspec". They can only have one "side" which always
refers to the source. During a fetch, this refers to the name of the ref
on the remote. During a push, this refers to the name of the ref on the
local side.
With negative refspecs, users can express more complex patterns. For
example:
git fetch origin refs/heads/*:refs/remotes/origin/* ^refs/heads/dontwant
will fetch all branches on origin into remotes/origin, but will exclude
fetching the branch named dontwant.
Refspecs today are commutative, meaning that order doesn't expressly
matter. Rather than forcing an implied order, negative refspecs will
always be applied last. That is, in order to match, a ref must match at
least one positive refspec, and match none of the negative refspecs.
This is similar to how negative pathspecs work.
Signed-off-by: Jacob Keller <jacob.keller@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-09-30 21:25:29 +00:00
|
|
|
)
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
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) &&
|
2020-11-18 23:44:34 +00:00
|
|
|
main_in_one=$(cd ../one && git rev-parse refs/heads/main) &&
|
refspec: add support for negative refspecs
Both fetch and push support pattern refspecs which allow fetching or
pushing references that match a specific pattern. Because these patterns
are globs, they have somewhat limited ability to express more complex
situations.
For example, suppose you wish to fetch all branches from a remote except
for a specific one. To allow this, you must setup a set of refspecs
which match only the branches you want. Because refspecs are either
explicit name matches, or simple globs, many patterns cannot be
expressed.
Add support for a new type of refspec, referred to as "negative"
refspecs. These are prefixed with a '^' and mean "exclude any ref
matching this refspec". They can only have one "side" which always
refers to the source. During a fetch, this refers to the name of the ref
on the remote. During a push, this refers to the name of the ref on the
local side.
With negative refspecs, users can express more complex patterns. For
example:
git fetch origin refs/heads/*:refs/remotes/origin/* ^refs/heads/dontwant
will fetch all branches on origin into remotes/origin, but will exclude
fetching the branch named dontwant.
Refspecs today are commutative, meaning that order doesn't expressly
matter. Rather than forcing an implied order, negative refspecs will
always be applied last. That is, in order to match, a ref must match at
least one positive refspec, and match none of the negative refspecs.
This is similar to how negative pathspecs work.
Signed-off-by: Jacob Keller <jacob.keller@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-09-30 21:25:29 +00:00
|
|
|
echo $alternate_in_one >expect &&
|
2020-11-18 23:44:34 +00:00
|
|
|
echo $main_in_one >>expect &&
|
|
|
|
|
git fetch ../one/.git refs/heads/*:refs/remotes/one/* ^main &&
|
refspec: add support for negative refspecs
Both fetch and push support pattern refspecs which allow fetching or
pushing references that match a specific pattern. Because these patterns
are globs, they have somewhat limited ability to express more complex
situations.
For example, suppose you wish to fetch all branches from a remote except
for a specific one. To allow this, you must setup a set of refspecs
which match only the branches you want. Because refspecs are either
explicit name matches, or simple globs, many patterns cannot be
expressed.
Add support for a new type of refspec, referred to as "negative"
refspecs. These are prefixed with a '^' and mean "exclude any ref
matching this refspec". They can only have one "side" which always
refers to the source. During a fetch, this refers to the name of the ref
on the remote. During a push, this refers to the name of the ref on the
local side.
With negative refspecs, users can express more complex patterns. For
example:
git fetch origin refs/heads/*:refs/remotes/origin/* ^refs/heads/dontwant
will fetch all branches on origin into remotes/origin, but will exclude
fetching the branch named dontwant.
Refspecs today are commutative, meaning that order doesn't expressly
matter. Rather than forcing an implied order, negative refspecs will
always be applied last. That is, in order to match, a ref must match at
least one positive refspec, and match none of the negative refspecs.
This is similar to how negative pathspecs work.
Signed-off-by: Jacob Keller <jacob.keller@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-09-30 21:25:29 +00:00
|
|
|
cut -f -1 .git/FETCH_HEAD >actual &&
|
|
|
|
|
test_cmp expect actual
|
|
|
|
|
)
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success "fetch with negative refspec avoids duplicate conflict" '
|
|
|
|
|
(
|
|
|
|
|
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
|
|
|
|
|
)
|
|
|
|
|
'
|
|
|
|
|
|
2020-12-22 03:58:16 +00:00
|
|
|
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
|
|
|
|
|
'
|
|
|
|
|
|
2021-04-16 12:49:57 +00:00
|
|
|
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
|
|
|
|
|
'
|
|
|
|
|
|
refspec: add support for negative refspecs
Both fetch and push support pattern refspecs which allow fetching or
pushing references that match a specific pattern. Because these patterns
are globs, they have somewhat limited ability to express more complex
situations.
For example, suppose you wish to fetch all branches from a remote except
for a specific one. To allow this, you must setup a set of refspecs
which match only the branches you want. Because refspecs are either
explicit name matches, or simple globs, many patterns cannot be
expressed.
Add support for a new type of refspec, referred to as "negative"
refspecs. These are prefixed with a '^' and mean "exclude any ref
matching this refspec". They can only have one "side" which always
refers to the source. During a fetch, this refers to the name of the ref
on the remote. During a push, this refers to the name of the ref on the
local side.
With negative refspecs, users can express more complex patterns. For
example:
git fetch origin refs/heads/*:refs/remotes/origin/* ^refs/heads/dontwant
will fetch all branches on origin into remotes/origin, but will exclude
fetching the branch named dontwant.
Refspecs today are commutative, meaning that order doesn't expressly
matter. Rather than forcing an implied order, negative refspecs will
always be applied last. That is, in order to match, a ref must match at
least one positive refspec, and match none of the negative refspecs.
This is similar to how negative pathspecs work.
Signed-off-by: Jacob Keller <jacob.keller@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-09-30 21:25:29 +00:00
|
|
|
test_done
|