t9903: fix broken && chain

j6t · gitster · commit c00bfc9d1be8 · 2016-09-07T11:35:08.000-07:00
We might wonder why our &amp;&amp; chain check does not catch this case:
The &amp;&amp; chain check uses a strange exit code with the expectation that
the second or later part of a broken &amp;&amp; chain would not exit with this
particular code.

This expectation does not work in this case because __git_ps1, being
the first command in the second part of the broken &amp;&amp; chain, records
the current exit code, does its work, and finally returns to the caller
with the recorded exit code. This fools our &amp;&amp; chain check.

Signed-off-by: Johannes Sixt &lt;j6t@kdbg.org&gt;
Reviewed-by: Jeff King &lt;peff@peff.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
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`	`'`