diff options
| author | Michael Haggerty <mhagger@alum.mit.edu> | 2012-09-09 08:19:49 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-12 11:46:32 -0700 |
| commit | 5f0fc64513c8cb638e0d6010005d8e86c9dbca3a (patch) | |
| tree | 9af38ff8d62999de23aab18eb9b08446294a0e95 /t | |
| parent | b285668dd23952b96d716aac769c0ed1080d11d3 (diff) | |
| download | git-5f0fc64513c8cb638e0d6010005d8e86c9dbca3a.tar.gz git-5f0fc64513c8cb638e0d6010005d8e86c9dbca3a.tar.xz | |
fetch-pack: eliminate spurious error messages
It used to be that if "--all", "--depth", and also explicit references
were sought, then the explicit references were not handled correctly
in filter_refs() because the "--all --depth" code took precedence over
the explicit reference handling, and the explicit references were
never noted as having been found. So check for explicitly sought
references before proceeding to the "--all --depth" logic.
This fixes two test cases in t5500.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t5500-fetch-pack.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t5500-fetch-pack.sh b/t/t5500-fetch-pack.sh index 894d945bd..6322e8ade 100755 --- a/t/t5500-fetch-pack.sh +++ b/t/t5500-fetch-pack.sh @@ -427,14 +427,14 @@ test_expect_success 'test missing ref before existing' ' test_cmp expect-error error-me ' -test_expect_failure 'test --all, --depth, and explicit head' ' +test_expect_success 'test --all, --depth, and explicit head' ' ( cd client && git fetch-pack --no-progress --all --depth=1 .. refs/heads/A ) >out-adh 2>error-adh ' -test_expect_failure 'test --all, --depth, and explicit tag' ' +test_expect_success 'test --all, --depth, and explicit tag' ' git tag OLDTAG refs/heads/B~5 && ( cd client && |