{"thread":{"id":"41740","subject":"[PATCH] t5500: do not depend on the way an earlier pull fails","startedAt":"2016-03-18T19:31:58Z","lastAt":"2016-03-18T19:31:58Z","messageCount":1,"participants":["Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"281171","messageId":"xmqqzitvpopd.fsf@gitster.mtv.corp.google.com","threadId":"41740","inReplyTo":null,"subject":"[PATCH] t5500: do not depend on the way an earlier pull fails","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2016-03-18T19:31:58Z","receivedAt":"2016-03-18T19:31:58Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Three tests before the test updated here is a test that is called\n'pull in shallow repo with missing merge base' and does this:\n\n    test_must_fail git pull --depth 4 .. A\n\nWhile attempting to create a merge after fetching necessary objects,\nthe current implementation happens to create a throw-away object to\nrepresent a conflicted merge result before failing.  This object is\nnot connected to any of the refs in the result (i.e. prunable).\n\nThe test touched by this patch counts the number of loose objects\nand depends on the presence of this prunable garbage.  Once we\nimprove the implementation of \"merge\" not to leave such a throw-away\nobject in the object database, this will start failing.\n\nRemove the throw-away object, if any, before counting in order to\nfuture-proof this test.\n\nSigned-off-by: Junio C Hamano <gitster@pobox.com>\n---\n t/t5500-fetch-pack.sh | 3 ++-\n 1 file changed, 2 insertions(+), 1 deletion(-)\n\ndiff --git a/t/t5500-fetch-pack.sh b/t/t5500-fetch-pack.sh\nindex e5f83bf..f4e479a 100755\n--- a/t/t5500-fetch-pack.sh\n+++ b/t/t5500-fetch-pack.sh\n@@ -279,9 +279,10 @@ test_expect_success 'clone shallow depth count' '\n test_expect_success 'clone shallow object count' '\n \t(\n \t\tcd shallow &&\n+\t\tgit prune &&\n \t\tgit count-objects -v\n \t) > count.shallow &&\n-\tgrep \"^count: 55\" count.shallow\n+\tgrep \"^count: 54\" count.shallow\n '\n \n test_expect_success 'fetch --no-shallow on full repo' '\n"}]}