From: Junio C Hamano Date: Fri, 10 Jul 2015 21:17:54 +0000 (-0700) Subject: Merge branch 'sb/p5310-and-chain' X-Git-Tag: v2.5.0-rc2~19 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/64fe6fcd9eab58069f2d3ad1ece75d5b66ca0e70?hp=e12fc40a154d6bd227de0596d9c0f33bb582d868 Merge branch 'sb/p5310-and-chain' Code clean-up. * sb/p5310-and-chain: p5310: Fix broken && chain in performance test --- diff --git a/t/perf/p5310-pack-bitmaps.sh b/t/perf/p5310-pack-bitmaps.sh index f8ed8573b7..de2a224a36 100755 --- a/t/perf/p5310-pack-bitmaps.sh +++ b/t/perf/p5310-pack-bitmaps.sh @@ -39,14 +39,14 @@ test_expect_success 'create partial bitmap state' ' # now kill off all of the refs and pretend we had # just the one tip - rm -rf .git/logs .git/refs/* .git/packed-refs - git update-ref HEAD $cutoff + rm -rf .git/logs .git/refs/* .git/packed-refs && + git update-ref HEAD $cutoff && # and then repack, which will leave us with a nice # big bitmap pack of the "old" history, and all of # the new history will be loose, as if it had been pushed # up incrementally and exploded via unpack-objects - git repack -Ad + git repack -Ad && # and now restore our original tip, as if the pushes # had happened