threads / patch / 39830

patchp5310: mend broken &&-chain

Subject: [PATCH] p5310: mend broken &&-chain

## tl;dr

3 messages between Jul 10, 2015 and Jul 11, 2015. Diffs are folded; open one to read it.

replies: 2people: 2as markdown or json

René Scharfe· Jul 10, 2015, 20:40 UTC · lore

Signed-off-by: Rene Scharfe <l.s.r@web.de>
---
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(-)

Show changes to t/perf/p5310-pack-bitmaps.sh +3 −3

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· Jul 10, 2015, 20:50 UTC · re: René Scharfe · lore

Re: [PATCH] p5310: mend broken &&-chain

On Fri, Jul 10, 2015 at 10:40:57PM +0200, René Scharfe wrote:

Show 12 quoted lines

> 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· Jul 11, 2015, 00:50 UTC · re: Jeff King · lore

Re: [PATCH] p5310: mend broken &&-chain

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é