mirror of
https://github.com/git/git.git
synced 2024-11-20 10:34:14 +01:00
1308c17b3e
Consider this history:
o--o-...-B <- origin
\ \
x--x--M--x--x <- master
In this situation, rebase considers master fully up-to-date and would
not do anything. However, if there were additional commits on origin,
the rebase would run and move the commits x on top of origin.
Here we change rebase to short-circuit out only if the history since origin
is strictly linear. Consequently, the above as well as a history like this
would be linearized:
o--o <- origin
\
x--x
\ \
x--M--x--x <- master
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
72 lines
1.9 KiB
Bash
Executable File
72 lines
1.9 KiB
Bash
Executable File
#!/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
|
|
|
|
export GIT_AUTHOR_EMAIL=bogus_email_address
|
|
|
|
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_failure \
|
|
'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_done
|