Skip to content

Commit

Permalink
Add two extra tests for git rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
Johannes Schindelin authored and Junio C Hamano committed Feb 9, 2009
1 parent 3021faf commit 3ec7371
Showing 1 changed file with 12 additions and 1 deletion.
13 changes: 12 additions & 1 deletion t/t3400-rebase.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 &&
Expand Down Expand Up @@ -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

0 comments on commit 3ec7371

Please sign in to comment.