diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-07-10 14:17:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-07-10 14:17:54 -0700 |
| commit | 64fe6fcd9eab58069f2d3ad1ece75d5b66ca0e70 (patch) | |
| tree | 9f3b309b090efd04c0fd0d340e8eaf1882890374 | |
| parent | e12fc40a154d6bd227de0596d9c0f33bb582d868 (diff) | |
| parent | 5330e6e2701185cbdab44e84dd525790eeee4492 (diff) | |
| download | git-64fe6fcd9eab58069f2d3ad1ece75d5b66ca0e70.tar.gz | |
Merge branch 'sb/p5310-and-chain'
Code clean-up.
* sb/p5310-and-chain:
p5310: Fix broken && chain in performance test
| -rwxr-xr-x | t/perf/p5310-pack-bitmaps.sh | 6 |
1 files changed, 3 insertions, 3 deletions
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 |