2005-12-14 22:48:19 +00:00
|
|
|
#!/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
|
|
|
|
|
2008-05-04 05:37:58 +00:00
|
|
|
GIT_AUTHOR_EMAIL=bogus_email_address
|
|
|
|
export GIT_AUTHOR_EMAIL
|
2005-12-14 22:48:19 +00:00
|
|
|
|
|
|
|
test_expect_success \
|
2007-07-04 20:09:10 +00:00
|
|
|
'prepare repository with topic branches' \
|
2009-02-09 05:40:42 +00:00
|
|
|
'git config core.logAllRefUpdates true &&
|
|
|
|
echo First > A &&
|
2007-07-03 05:52:14 +00:00
|
|
|
git update-index --add A &&
|
2008-09-03 08:59:27 +00:00
|
|
|
git commit -m "Add A." &&
|
2005-12-14 22:48:19 +00:00
|
|
|
git checkout -b my-topic-branch &&
|
|
|
|
echo Second > B &&
|
2007-07-03 05:52:14 +00:00
|
|
|
git update-index --add B &&
|
2008-09-03 08:59:27 +00:00
|
|
|
git commit -m "Add B." &&
|
2005-12-14 22:48:19 +00:00
|
|
|
git checkout -f master &&
|
|
|
|
echo Third >> A &&
|
2007-07-03 05:52:14 +00:00
|
|
|
git update-index A &&
|
2008-09-03 08:59:27 +00:00
|
|
|
git commit -m "Modify A." &&
|
2007-07-04 20:09:10 +00:00
|
|
|
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 &&
|
2005-12-14 22:48:19 +00:00
|
|
|
git checkout -f my-topic-branch &&
|
2007-07-04 20:09:10 +00:00
|
|
|
git tag topic
|
|
|
|
'
|
|
|
|
|
2009-05-23 15:31:02 +00:00
|
|
|
test_expect_success 'rebase on dirty worktree' '
|
|
|
|
echo dirty >> A &&
|
|
|
|
test_must_fail git rebase master'
|
|
|
|
|
|
|
|
test_expect_success 'rebase on dirty cache' '
|
|
|
|
git add A &&
|
|
|
|
test_must_fail git rebase master'
|
|
|
|
|
2007-07-04 20:09:10 +00:00
|
|
|
test_expect_success 'rebase against master' '
|
2009-05-23 15:31:02 +00:00
|
|
|
git reset --hard HEAD &&
|
2005-12-14 22:48:19 +00:00
|
|
|
git rebase master'
|
|
|
|
|
2009-05-23 15:31:02 +00:00
|
|
|
test_expect_success 'rebase against master twice' '
|
2009-06-16 22:33:01 +00:00
|
|
|
git rebase master >out &&
|
|
|
|
grep "Current branch my-topic-branch is up to date" out
|
2009-05-23 15:31:02 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'rebase against master twice with --force' '
|
|
|
|
git rebase --force-rebase master >out &&
|
|
|
|
grep "Current branch my-topic-branch is up to date, rebase forced" out
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'rebase against master twice from another branch' '
|
|
|
|
git checkout my-topic-branch^ &&
|
2009-06-16 22:33:01 +00:00
|
|
|
git rebase master my-topic-branch >out &&
|
|
|
|
grep "Current branch my-topic-branch is up to date" out
|
2009-05-23 15:31:02 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'rebase fast-forward to master' '
|
|
|
|
git checkout my-topic-branch^ &&
|
2009-06-16 22:33:01 +00:00
|
|
|
git rebase my-topic-branch >out &&
|
|
|
|
grep "Fast-forwarded HEAD to my-topic-branch" out
|
2009-05-23 15:31:02 +00:00
|
|
|
'
|
|
|
|
|
2008-02-01 09:50:53 +00:00
|
|
|
test_expect_success \
|
2005-12-14 22:48:19 +00:00
|
|
|
'the rebase operation should not have destroyed author information' \
|
2008-05-14 04:01:22 +00:00
|
|
|
'! (git log | grep "Author:" | grep "<>")'
|
2005-12-14 22:48:19 +00:00
|
|
|
|
2009-03-01 10:20:03 +00:00
|
|
|
test_expect_success 'HEAD was detached during rebase' '
|
|
|
|
test $(git rev-parse HEAD@{1}) != $(git rev-parse my-topic-branch@{1})
|
|
|
|
'
|
|
|
|
|
2007-07-04 20:09:10 +00:00
|
|
|
test_expect_success 'rebase after merge master' '
|
|
|
|
git reset --hard topic &&
|
|
|
|
git merge master &&
|
|
|
|
git rebase master &&
|
2008-05-14 04:01:22 +00:00
|
|
|
! (git show | grep "^Merge:")
|
2007-07-04 20:09:10 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
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)
|
|
|
|
'
|
|
|
|
|
2007-09-17 00:24:57 +00:00
|
|
|
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 &&
|
2009-02-28 20:12:57 +00:00
|
|
|
test_chmod +x A &&
|
2007-09-17 00:24:57 +00:00
|
|
|
test_tick &&
|
2009-02-28 20:12:57 +00:00
|
|
|
git commit -m modechange &&
|
2007-09-17 00:24:57 +00:00
|
|
|
GIT_TRACE=1 git rebase master
|
|
|
|
'
|
|
|
|
|
2009-02-09 05:40:42 +00:00
|
|
|
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
|
|
|
|
'
|
|
|
|
|
2009-06-16 22:33:01 +00:00
|
|
|
test_expect_success 'rebase -q is quiet' '
|
|
|
|
rm B &&
|
|
|
|
git checkout -b quiet topic &&
|
|
|
|
git rebase -q master > output.out 2>&1 &&
|
|
|
|
test ! -s output.out
|
|
|
|
'
|
|
|
|
|
2005-12-14 22:48:19 +00:00
|
|
|
test_done
|