t3404: begin "exchange commits with -p" test with correct preconditions
authorJohannes Sixt <j6t@kdbg.org>
Sat, 19 May 2012 13:14:16 +0000 (15:14 +0200)
committerJunio C Hamano <gitster@pobox.com>
Sun, 20 May 2012 21:54:07 +0000 (14:54 -0700)
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 <j6t@kdbg.org>
Acked-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t3404-rebase-interactive.sh

index 7fd2127625506c39371bda873ec2f56593b65aca..eab8501e11b31a65abc405885be425359220fdaa 100755 (executable)
@@ -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)