diff options
| author | Michael Haggerty <mhagger@alum.mit.edu> | 2012-09-09 06:19:42 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-12 18:46:31 (GMT) |
| commit | 4c58f13ba67f9dbe67a351de61703a2db20712cc (patch) | |
| tree | 7dcf43f563e5291d4fef6f9a38a8de56933d0b17 /t/t5500-fetch-pack.sh | |
| parent | 382a96711470489ea6e4e277accd3afc46526bfc (diff) | |
| download | git-4c58f13ba67f9dbe67a351de61703a2db20712cc.zip git-4c58f13ba67f9dbe67a351de61703a2db20712cc.tar.gz git-4c58f13ba67f9dbe67a351de61703a2db20712cc.tar.bz2 | |
fetch_pack(): update sought->nr to reflect number of unique entries
fetch_pack() removes duplicates from the "sought" list, thereby
shrinking the list. But previously, the caller was not informed about
the shrinkage. This would cause a spurious error message to be
emitted by cmd_fetch_pack() if "git fetch-pack" is called with
duplicate refnames.
Instead, remove duplicates using string_list_remove_duplicates(),
which adjusts sought->nr to reflect the new length of the list.
The last test of t5500 inexplicably *required* "git fetch-pack" to
fail when fetching a list of references that contains duplicates;
i.e., it insisted on the buggy behavior. So change the test to expect
the correct behavior.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5500-fetch-pack.sh')
| -rwxr-xr-x | t/t5500-fetch-pack.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t5500-fetch-pack.sh b/t/t5500-fetch-pack.sh index 15d277f..acd41e8 100755 --- a/t/t5500-fetch-pack.sh +++ b/t/t5500-fetch-pack.sh @@ -391,7 +391,7 @@ test_expect_success 'fetch mixed refs from cmdline and stdin' ' test_expect_success 'test duplicate refs from stdin' ' ( cd client && - test_must_fail git fetch-pack --stdin --no-progress .. <../input.dup + git fetch-pack --stdin --no-progress .. <../input.dup ) >output && cut -d " " -f 2 <output | sort >actual && test_cmp expect actual |