Skip to contentSkip to conversation

p5310: mend broken &&-chain

PATCH In review René Scharfe 2 participants 3 messages Jun 15, 2016

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 p5310: mend broken &&-chain

---
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(-)
t/perf/p5310-pack-bitmaps.sh +3 -3
index f8ed857..de2a224 100755
@@ -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
Signature · 1 line
2.4.4
#1 lore raw

t/perf/p5310-pack-bitmaps.sh test_expect_success 'create partial bitmap state' ' · line 43

Quoted 12 lines · René Scharfe
t/perf/p5310-pack-bitmaps.sh +2 -2
index f8ed857..de2a224 100755
@@ -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

#2 lore raw

Am 10.07.2015 um 22:50 schrieb Jeff King:

Quoted 3 lines

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é