# [PATCH] p5310: mend broken &&-chain 3 messages from 2015-07-10 to 2015-07-11. Participants: René Scharfe, Jeff King. Thread: https://gitlist.dev/t/39830 ## René Scharfe, 2015-07-10 20:40 Subject: [PATCH] p5310: mend broken &&-chain Message-ID: <55A02DD9.3020909@web.de> URL: https://gitlist.dev/e/55A02DD9.3020909%40web.de ``` Signed-off-by: Rene Scharfe --- GIT_TEST_CHAIN_LINT complains about the missing &&s and is enabled by default now. t/perf/p5310-pack-bitmaps.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/t/perf/p5310-pack-bitmaps.sh b/t/perf/p5310-pack-bitmaps.sh index f8ed857..de2a224 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 -- 2.4.4 ``` ## Jeff King, 2015-07-10 20:50 Subject: Re: [PATCH] p5310: mend broken &&-chain Message-ID: <20150710205029.GA1181@peff.net> URL: https://gitlist.dev/e/20150710205029.GA1181%40peff.net In-Reply-To: <55A02DD9.3020909@web.de> ``` On Fri, Jul 10, 2015 at 10:40:57PM +0200, René Scharfe wrote: > diff --git a/t/perf/p5310-pack-bitmaps.sh b/t/perf/p5310-pack-bitmaps.sh > index f8ed857..de2a224 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 && Thanks, this definitely is a problem, but we already have a fix in the sb/p5310-and-chain topic. I thought that had been merged-up, but it looks like it is only in "next" right now. -Peff ``` ## René Scharfe, 2015-07-11 00:50 Subject: Re: [PATCH] p5310: mend broken &&-chain Message-ID: <55A06838.4090808@web.de> URL: https://gitlist.dev/e/55A06838.4090808%40web.de In-Reply-To: <20150710205029.GA1181@peff.net> ``` Am 10.07.2015 um 22:50 schrieb Jeff King: > Thanks, this definitely is a problem, but we already have a fix in the > sb/p5310-and-chain topic. I thought that had been merged-up, but it > looks like it is only in "next" right now. All the better. And I see it's in master now. René ```