diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-09-24 21:39:21 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-09-24 21:39:21 +0200 |
commit | 8144049d79f2678eb6cee7bb9070341e3fcfe282 (patch) | |
tree | 6b59c21966cc4cee2b42f89a8c7ace853697a8c8 /t | |
parent | Improve the description of GIT_PS1_SHOWUPSTREAM (diff) | |
parent | fetch --all: pass --tags/--no-tags through to each remote (diff) | |
download | git-8144049d79f2678eb6cee7bb9070341e3fcfe282.tar.xz git-8144049d79f2678eb6cee7bb9070341e3fcfe282.zip |
Merge branch 'dj/fetch-all-tags' into maint
"git fetch --all", when passed "--no-tags", did not honor the
"--no-tags" option while fetching from individual remotes (the same
issue existed with "--tags", but combination "--all --tags" makes
much less sense than "--all --no-tags").
* dj/fetch-all-tags:
fetch --all: pass --tags/--no-tags through to each remote
submodule: use argv_array instead of hand-building arrays
fetch: use argv_array instead of hand-building arrays
argv-array: fix bogus cast when freeing array
argv-array: add pop function
Diffstat (limited to 't')
-rwxr-xr-x | t/t5514-fetch-multiple.sh | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/t/t5514-fetch-multiple.sh b/t/t5514-fetch-multiple.sh index 227dd56137..0f8140957f 100755 --- a/t/t5514-fetch-multiple.sh +++ b/t/t5514-fetch-multiple.sh @@ -151,4 +151,34 @@ test_expect_success 'git fetch --multiple (ignoring skipFetchAll)' ' test_cmp ../expect output) ' +test_expect_success 'git fetch --all --no-tags' ' + >expect && + git clone one test5 && + git clone test5 test6 && + (cd test5 && git tag test-tag) && + ( + cd test6 && + git fetch --all --no-tags && + git tag >output + ) && + test_cmp expect test6/output +' + +test_expect_success 'git fetch --all --tags' ' + echo test-tag >expect && + git clone one test7 && + git clone test7 test8 && + ( + cd test7 && + test_commit test-tag && + git reset --hard HEAD^ + ) && + ( + cd test8 && + git fetch --all --tags && + git tag >output + ) && + test_cmp expect test8/output +' + test_done |