From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Mon, 9 Feb 2009 05:40:42 +0000 (-0800)
Subject: Add two extra tests for git rebase
X-Git-Tag: v1.6.2-rc1~50
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=3ec7371f63046aa6d8e13ddeb1eaa9cccfbf2aa2;p=git.git

Add two extra tests for git rebase
---

diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh
index b7a670ef4..8c0c5f598 100755
--- a/t/t3400-rebase.sh
+++ b/t/t3400-rebase.sh
@@ -14,7 +14,8 @@ export GIT_AUTHOR_EMAIL
 
 test_expect_success \
     'prepare repository with topic branches' \
-    'echo First > A &&
+    'git config core.logAllRefUpdates true &&
+     echo First > A &&
      git update-index --add A &&
      git commit -m "Add A." &&
      git checkout -b my-topic-branch &&
@@ -84,4 +85,14 @@ 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 &&
+     grep "Untracked working tree file .B. would be overwritten" output.err
+'
+
 test_done