3c02396adc
The current message is too long and at too low a level for anybody to understand it if they don't know about the configuration format already. The text about setting up a remote is superfluous and doesn't help understand or recover from the error that has happened. Show the usage more prominently and explain how to set up the tracking information. If there is only one remote, that name is used instead of the generic <remote>. Also simplify the message we print on detached HEAD to remove unnecessary information which is better left for the documentation. Signed-off-by: Carlos Martín Nieto <cmn@elego.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
243 lines
6.3 KiB
Bash
Executable File
243 lines
6.3 KiB
Bash
Executable File
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2005 Amos Waterland
|
|
#
|
|
|
|
test_description='git rebase assorted tests
|
|
|
|
This test runs git rebase and checks that the author information is not lost
|
|
among other things.
|
|
'
|
|
. ./test-lib.sh
|
|
|
|
GIT_AUTHOR_NAME=author@name
|
|
GIT_AUTHOR_EMAIL=bogus@email@address
|
|
export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL
|
|
|
|
test_expect_success 'prepare repository with topic branches' '
|
|
git config core.logAllRefUpdates true &&
|
|
echo First >A &&
|
|
git update-index --add A &&
|
|
git commit -m "Add A." &&
|
|
git checkout -b force-3way &&
|
|
echo Dummy >Y &&
|
|
git update-index --add Y &&
|
|
git commit -m "Add Y." &&
|
|
git checkout -b filemove &&
|
|
git reset --soft master &&
|
|
mkdir D &&
|
|
git mv A D/A &&
|
|
git commit -m "Move A." &&
|
|
git checkout -b my-topic-branch master &&
|
|
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 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
|
|
'
|
|
|
|
test_expect_success 'rebase against master' '
|
|
git reset --hard HEAD &&
|
|
git rebase master
|
|
'
|
|
|
|
test_expect_success 'rebase against master twice' '
|
|
git rebase master >out &&
|
|
grep "Current branch my-topic-branch is up to date" out
|
|
'
|
|
|
|
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^ &&
|
|
git rebase master my-topic-branch >out &&
|
|
grep "Current branch my-topic-branch is up to date" out
|
|
'
|
|
|
|
test_expect_success 'rebase fast-forward to master' '
|
|
git checkout my-topic-branch^ &&
|
|
git rebase my-topic-branch >out &&
|
|
grep "Fast-forwarded HEAD to my-topic-branch" out
|
|
'
|
|
|
|
test_expect_success 'the rebase operation should not have destroyed author information' '
|
|
! (git log | grep "Author:" | grep "<>")
|
|
'
|
|
|
|
test_expect_success 'the rebase operation should not have destroyed author information (2)' "
|
|
git log -1 |
|
|
grep 'Author: $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>'
|
|
"
|
|
|
|
test_expect_success 'HEAD was detached during rebase' '
|
|
test $(git rev-parse HEAD@{1}) != $(git rev-parse my-topic-branch@{1})
|
|
'
|
|
|
|
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 &&
|
|
test_chmod +x A &&
|
|
test_tick &&
|
|
git commit -m modechange &&
|
|
GIT_TRACE=1 git rebase master
|
|
'
|
|
|
|
test_expect_success 'rebase is not broken by diff.renames' '
|
|
git config diff.renames copies &&
|
|
test_when_finished "git config --unset diff.renames" &&
|
|
git checkout filemove &&
|
|
GIT_TRACE=1 git rebase force-3way
|
|
'
|
|
|
|
test_expect_success 'setup: recover' '
|
|
test_might_fail git rebase --abort &&
|
|
git reset --hard &&
|
|
git checkout modechange
|
|
'
|
|
|
|
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 "The following untracked working tree files would be overwritten by checkout:" output.err &&
|
|
grep B output.err
|
|
'
|
|
rm -f B
|
|
|
|
test_expect_success 'fail when upstream arg is missing and not on branch' '
|
|
git checkout topic &&
|
|
test_must_fail git rebase
|
|
'
|
|
|
|
test_expect_success 'fail when upstream arg is missing and not configured' '
|
|
git checkout -b no-config topic &&
|
|
test_must_fail git rebase
|
|
'
|
|
|
|
test_expect_success 'default to @{upstream} when upstream arg is missing' '
|
|
git checkout -b default topic &&
|
|
git config branch.default.remote . &&
|
|
git config branch.default.merge refs/heads/master &&
|
|
git rebase &&
|
|
test "$(git rev-parse default~1)" = "$(git rev-parse master)"
|
|
'
|
|
|
|
test_expect_success 'rebase -q is quiet' '
|
|
git checkout -b quiet topic &&
|
|
git rebase -q master >output.out 2>&1 &&
|
|
test ! -s output.out
|
|
'
|
|
|
|
test_expect_success 'Rebase a commit that sprinkles CRs in' '
|
|
(
|
|
echo "One"
|
|
echo "TwoQ"
|
|
echo "Three"
|
|
echo "FQur"
|
|
echo "Five"
|
|
) | q_to_cr >CR &&
|
|
git add CR &&
|
|
test_tick &&
|
|
git commit -a -m "A file with a line with CR" &&
|
|
git tag file-with-cr &&
|
|
git checkout HEAD^0 &&
|
|
git rebase --onto HEAD^^ HEAD^ &&
|
|
git diff --exit-code file-with-cr:CR HEAD:CR
|
|
'
|
|
|
|
test_expect_success 'rebase can copy notes' '
|
|
git config notes.rewrite.rebase true &&
|
|
git config notes.rewriteRef "refs/notes/*" &&
|
|
test_commit n1 &&
|
|
test_commit n2 &&
|
|
test_commit n3 &&
|
|
git notes add -m"a note" n3 &&
|
|
git rebase --onto n1 n2 &&
|
|
test "a note" = "$(git notes show HEAD)"
|
|
'
|
|
|
|
test_expect_success 'rebase -m can copy notes' '
|
|
git reset --hard n3 &&
|
|
git rebase -m --onto n1 n2 &&
|
|
test "a note" = "$(git notes show HEAD)"
|
|
'
|
|
|
|
test_expect_success 'rebase commit with an ancient timestamp' '
|
|
git reset --hard &&
|
|
|
|
>old.one && git add old.one && test_tick &&
|
|
git commit --date="@12345 +0400" -m "Old one" &&
|
|
>old.two && git add old.two && test_tick &&
|
|
git commit --date="@23456 +0500" -m "Old two" &&
|
|
>old.three && git add old.three && test_tick &&
|
|
git commit --date="@34567 +0600" -m "Old three" &&
|
|
|
|
git cat-file commit HEAD^^ >actual &&
|
|
grep "author .* 12345 +0400$" actual &&
|
|
git cat-file commit HEAD^ >actual &&
|
|
grep "author .* 23456 +0500$" actual &&
|
|
git cat-file commit HEAD >actual &&
|
|
grep "author .* 34567 +0600$" actual &&
|
|
|
|
git rebase --onto HEAD^^ HEAD^ &&
|
|
|
|
git cat-file commit HEAD >actual &&
|
|
grep "author .* 34567 +0600$" actual
|
|
'
|
|
|
|
test_done
|