You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
87 lines
2.3 KiB
87 lines
2.3 KiB
#!/bin/sh |
|
# |
|
# Copyright (c) 2005 Amos Waterland |
|
# |
|
|
|
test_description='git rebase should not destroy author information |
|
|
|
This test runs git rebase and checks that the author information is not lost. |
|
' |
|
. ./test-lib.sh |
|
|
|
GIT_AUTHOR_EMAIL=bogus_email_address |
|
export GIT_AUTHOR_EMAIL |
|
|
|
test_expect_success \ |
|
'prepare repository with topic branches' \ |
|
'echo First > A && |
|
git update-index --add A && |
|
git commit -m "Add A." && |
|
git checkout -b my-topic-branch && |
|
echo Second > B && |
|
git update-index --add B && |
|
git commit -m "Add B." && |
|
git checkout -f master && |
|
echo Third >> A && |
|
git update-index A && |
|
git commit -m "Modify A." && |
|
git checkout -b side my-topic-branch && |
|
echo Side >> C && |
|
git add C && |
|
git commit -m "Add C" && |
|
git checkout -b nonlinear my-topic-branch && |
|
echo Edit >> B && |
|
git add B && |
|
git commit -m "Modify B" && |
|
git merge side && |
|
git checkout -b upstream-merged-nonlinear && |
|
git merge master && |
|
git checkout -f my-topic-branch && |
|
git tag topic |
|
' |
|
|
|
test_expect_success 'rebase against master' ' |
|
git rebase master' |
|
|
|
test_expect_success \ |
|
'the rebase operation should not have destroyed author information' \ |
|
'! (git log | grep "Author:" | grep "<>")' |
|
|
|
test_expect_success 'rebase after merge master' ' |
|
git reset --hard topic && |
|
git merge master && |
|
git rebase master && |
|
! (git show | grep "^Merge:") |
|
' |
|
|
|
test_expect_success 'rebase of history with merges is linearized' ' |
|
git checkout nonlinear && |
|
test 4 = $(git rev-list master.. | wc -l) && |
|
git rebase master && |
|
test 3 = $(git rev-list master.. | wc -l) |
|
' |
|
|
|
test_expect_success \ |
|
'rebase of history with merges after upstream merge is linearized' ' |
|
git checkout upstream-merged-nonlinear && |
|
test 5 = $(git rev-list master.. | wc -l) && |
|
git rebase master && |
|
test 3 = $(git rev-list master.. | wc -l) |
|
' |
|
|
|
test_expect_success 'rebase a single mode change' ' |
|
git checkout master && |
|
echo 1 > X && |
|
git add X && |
|
test_tick && |
|
git commit -m prepare && |
|
git checkout -b modechange HEAD^ && |
|
echo 1 > X && |
|
git add X && |
|
chmod a+x A && |
|
test_tick && |
|
git commit -m modechange A X && |
|
GIT_TRACE=1 git rebase master |
|
' |
|
|
|
test_done
|
|
|