diff options
author | Carlos Martín Nieto <cmn@elego.de> | 2011-10-15 07:04:26 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-10-15 22:00:37 -0700 |
commit | e8c1e6c796c1b96b6b208bbd4bc8cfd9acb481b5 (patch) | |
tree | 6de4732d4833f40e31b11dd50097a638fd3c5c90 /t/t5510-fetch.sh | |
parent | fetch: honor the user-provided refspecs when pruning refs (diff) | |
download | tgif-e8c1e6c796c1b96b6b208bbd4bc8cfd9acb481b5.tar.xz |
fetch: treat --tags like refs/tags/*:refs/tags/* when pruning
If --tags is specified, add that refspec to the list given to
prune_refs so it knows to treat it as a filter on what refs to
should consider for prunning. This way
git fetch --prune --tags origin
only prunes tags and doesn't delete the branch refs.
Signed-off-by: Carlos Martín Nieto <cmn@elego.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5510-fetch.sh')
-rwxr-xr-x | t/t5510-fetch.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh index 581049bf94..e0af4c4e62 100755 --- a/t/t5510-fetch.sh +++ b/t/t5510-fetch.sh @@ -105,7 +105,7 @@ test_expect_success 'fetch --prune with a namespace keeps other namespaces' ' git rev-parse origin/master ' -test_expect_failure 'fetch --prune --tags does not delete the remote-tracking branches' ' +test_expect_success 'fetch --prune --tags does not delete the remote-tracking branches' ' cd "$D" && git clone . prune-tags && cd prune-tags && @@ -116,7 +116,7 @@ test_expect_failure 'fetch --prune --tags does not delete the remote-tracking br test_must_fail git rev-parse somebranch ' -test_expect_failure 'fetch --prune --tags with branch does not delete other remote-tracking branches' ' +test_expect_success 'fetch --prune --tags with branch does not delete other remote-tracking branches' ' cd "$D" && git clone . prune-tags-branch && cd prune-tags-branch && |