Merge branch 'rr/maint-t3510-cascade-fix'

gitster · gitster · commit 1b829eee1744 · 2012-06-07T09:07:27.000-07:00
* rr/maint-t3510-cascade-fix:
  t3510 (cherry-pick-sequence): add missing '&amp;&amp;'
diff --git a/t/t3510-cherry-pick-sequence.sh b/t/t3510-cherry-pick-sequence.sh
@@ -31,7 +31,7 @@ test_cmp_rev () {
 }
 
 test_expect_success setup '
-	git config advice.detachedhead false
+	git config advice.detachedhead false &&
 	echo unrelated >unrelated &&
 	git add unrelated &&
 	test_commit initial foo a &&

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ test_cmp_rev () {`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`test_expect_success setup '`
`34`		`- git config advice.detachedhead false`
	`34`	`+ git config advice.detachedhead false &&`
`35`	`35`	`echo unrelated >unrelated &&`
`36`	`36`	`git add unrelated &&`
`37`	`37`	`test_commit initial foo a &&`