t3404: begin "exchange commits with -p" test with correct preconditions

j6t · gitster · commit 27ccd8d1a3cc · 2012-05-20T14:54:07.000-07:00
The test case shows a bug in 'rebase -p', but even if the bug were fixed
the test would fail because it did not ensure that the preconditions match
the postconditions that were checked. Insert the suitable 'git checkout'.

Signed-off-by: Johannes Sixt &lt;j6t@kdbg.org&gt;
Acked-by: Jonathan Nieder &lt;jrnieder@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
@@ -247,6 +247,7 @@ test_expect_success '-p handles "no changes" gracefully' '
 '
 
 test_expect_failure 'exchange two commits with -p' '
+	git checkout H &&
 	FAKE_LINES="2 1" git rebase -i -p HEAD~2 &&
 	test H = $(git cat-file commit HEAD^ | sed -ne \$p) &&
 	test G = $(git cat-file commit HEAD | sed -ne \$p)

Original file line number	Diff line number	Diff line change
`@@ -247,6 +247,7 @@ test_expect_success '-p handles "no changes" gracefully' '`
`247`	`247`	`'`
`248`	`248`
`249`	`249`	`test_expect_failure 'exchange two commits with -p' '`
	`250`	`+ git checkout H &&`
`250`	`251`	`FAKE_LINES="2 1" git rebase -i -p HEAD~2 &&`
`251`	`252`	`test H = $(git cat-file commit HEAD^ \| sed -ne \$p) &&`
`252`	`253`	`test G = $(git cat-file commit HEAD \| sed -ne \$p)`