From 4c58f13ba67f9dbe67a351de61703a2db20712cc Mon Sep 17 00:00:00 2001 From: Michael Haggerty Date: Sun, 9 Sep 2012 08:19:42 +0200 Subject: 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 Signed-off-by: Junio C Hamano --- t/t5500-fetch-pack.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 't/t5500-fetch-pack.sh') diff --git a/t/t5500-fetch-pack.sh b/t/t5500-fetch-pack.sh index 15d277f158..acd41e8576 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 actual && test_cmp expect actual -- cgit v1.2.1