From 861050cc2eaa963fcdb3b0860b854aee5f87e727 Mon Sep 17 00:00:00 2001 From: Johannes Sixt Date: Tue, 17 Feb 2009 18:54:01 +0100 Subject: [PATCH] t3400-rebase: Move detached HEAD check earlier 3ec7371f (Add two extra tests for git rebase, 2009-02-09) added a check that rebase works on a detached HEAD. For this check, the last test was picked, whose topic is to rebase a mode change. This rebase operation amounts to a no-op on Windows/MinGW so that HEAD@{1} *is* modechange@{1}, and the intended detached HEAD test fails. This patch moves the check earlier, into the group of tests that check basic rebase properties. Signed-off-by: Johannes Sixt --- t/t3400-rebase.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh index 8c0c5f5982..be7ae5a004 100755 --- a/t/t3400-rebase.sh +++ b/t/t3400-rebase.sh @@ -48,6 +48,10 @@ test_expect_success \ 'the rebase operation should not have destroyed author information' \ '! (git log | grep "Author:" | grep "<>")' +test_expect_success 'HEAD was detached during rebase' ' + test $(git rev-parse HEAD@{1}) != $(git rev-parse my-topic-branch@{1}) +' + test_expect_success 'rebase after merge master' ' git reset --hard topic && git merge master && @@ -85,10 +89,6 @@ test_expect_success 'rebase a single mode change' ' GIT_TRACE=1 git rebase master ' -test_expect_success 'HEAD was detached during rebase' ' - test $(git rev-parse HEAD@{1}) != $(git rev-parse modechange@{1}) -' - test_expect_success 'Show verbose error when HEAD could not be detached' ' : > B && test_must_fail git rebase topic 2> output.err > output.out && -- 2.11.4.GIT