Merge branch 'js/t9903-chaining' into maint

gitster · gitster · commit 294573e6d7ac · 2016-09-19T13:51:44.000-07:00
Test fix.

* js/t9903-chaining:
  t9903: fix broken &amp;&amp; chain
diff --git a/t/t9903-bash-prompt.sh b/t/t9903-bash-prompt.sh
@@ -177,7 +177,7 @@ test_expect_success 'prompt - interactive rebase' '
 	git checkout b1 &&
 	test_when_finished "git checkout master" &&
 	git rebase -i HEAD^ &&
-	test_when_finished "git rebase --abort"
+	test_when_finished "git rebase --abort" &&
 	__git_ps1 >"$actual" &&
 	test_cmp expected "$actual"
 '

Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,7 @@ test_expect_success 'prompt - interactive rebase' '`
`177`	`177`	`git checkout b1 &&`
`178`	`178`	`test_when_finished "git checkout master" &&`
`179`	`179`	`git rebase -i HEAD^ &&`
`180`		`- test_when_finished "git rebase --abort"`
	`180`	`+ test_when_finished "git rebase --abort" &&`
`181`	`181`	`__git_ps1 >"$actual" &&`
`182`	`182`	`test_cmp expected "$actual"`
`183`	`183`	`'`