Re: [PATCH 6/6] fetch-pack: fix deepen shallow over smart http with no-done cap
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:59:52
Duy Nguyen [off-list ref] writes:
On Fri, Feb 07, 2014 at 10:01:08AM -0800, Junio C Hamano wrote:quoted
Here is the difference between the posted series and what I queued after applying the changes suggested during the review. Thanks.I was going to send a reroll after the received comments. Could you put this on top of 6/6, just to make sure future changes in t5537 (maybe more or less commits created..) does not change the test behavior? It fixes the test name too. I originally thought, ok let's create commits in one test and do fetch in another. But it ended up in the same test and I forgot to update test name.
Surely, and thanks for being careful. Will squash it in.
quoted hunk
-- 8< --diff --git a/t/t5537-fetch-shallow.sh b/t/t5537-fetch-shallow.sh index 1413caf..b300383 100755 --- a/t/t5537-fetch-shallow.sh +++ b/t/t5537-fetch-shallow.sh@@ -203,7 +203,7 @@ EOF # This test is tricky. We need large enough "have"s that fetch-pack # will put pkt-flush in between. Then we need a "have" the server # does not have, it'll send "ACK %s ready" -test_expect_success 'add more commits' ' +test_expect_success 'no shallow lines after receiving ACK ready' ' ( cd shallow && for i in $(test_seq 10)@@ -224,7 +224,9 @@ test_expect_success 'add more commits' ' cd clone && git checkout --orphan newnew && test_commit new-too && - git fetch --depth=2 + GIT_TRACE_PACKET="$TRASH_DIRECTORY/trace" git fetch --depth=2 && + grep "fetch-pack< ACK .* ready" ../trace && + ! grep "fetch-pack> done" ../trace ) ' -- 8< --