From: Johannes Sixt Date: Sat, 19 May 2012 13:14:16 +0000 (+0200) Subject: t3404: begin "exchange commits with -p" test with correct preconditions X-Git-Tag: v1.7.10.3~9 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=27ccd8d1a3ccb539d1d97302e1f500b6d20eb781;p=git.git t3404: begin "exchange commits with -p" test with correct preconditions 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 Acked-by: Jonathan Nieder Signed-off-by: Junio C Hamano --- diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index 7fd212762..eab8501e1 100755 --- 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)