summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3021faf)
raw | patch | inline | side by side (parent: 3021faf)
author | Johannes Schindelin <johannes.schindelin@gmx.de> | |
Mon, 9 Feb 2009 05:40:42 +0000 (21:40 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Mon, 9 Feb 2009 05:40:52 +0000 (21:40 -0800) |
t/t3400-rebase.sh | patch | blob | history |
diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh
index b7a670ef401429a50eb97e5f874c9e2c3897fd7d..8c0c5f59827544b47cc7a75f0c3f39cfcecf0a7e 100755 (executable)
--- a/t/t3400-rebase.sh
+++ b/t/t3400-rebase.sh
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 &&
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