diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-07-28 02:14:14 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-07-28 02:14:15 +0400 |
| commit | 4799593e26f09e4209249caf9536001036618ac2 (patch) | |
| tree | fba851e4ab180d0b9ef8055d7c4ebda42034c402 /t | |
| parent | 996b0fdbb4ff63bfd880b3901f054139c95611cf (diff) | |
| parent | f0e802ca200b1296495d2ee5c55cd8f8083486bc (diff) | |
Merge branch 'jk/stable-prio-queue'
* jk/stable-prio-queue:
t5539: update a flaky test
paint_down_to_common: use prio_queue
prio-queue: make output stable with respect to insertion
prio-queue: factor out compare and swap operations
Diffstat (limited to 't')
| -rwxr-xr-x | t/t5539-fetch-http-shallow.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/t/t5539-fetch-http-shallow.sh b/t/t5539-fetch-http-shallow.sh index 94553e1039..b46118846c 100755 --- a/t/t5539-fetch-http-shallow.sh +++ b/t/t5539-fetch-http-shallow.sh @@ -54,6 +54,7 @@ EOF test_expect_success 'no shallow lines after receiving ACK ready' ' ( cd shallow && + test_tick && for i in $(test_seq 15) do git checkout --orphan unrelated$i && |