mirror of
https://github.com/git/git.git
synced 2024-11-24 02:17:02 +08:00
9b6d7a6245
Interactive rebase was ignoring '--rerere-autoupdate'. Fix this by reading it appropriate file when restoring the sequencer state for an interactive rebase and passing '--rerere-autoupdate' to merge and cherry-pick when rebasing with '--preserve-merges'. Reported-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
149 lines
3.8 KiB
Bash
Executable File
149 lines
3.8 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='git rebase --continue tests'
|
|
|
|
. ./test-lib.sh
|
|
|
|
. "$TEST_DIRECTORY"/lib-rebase.sh
|
|
|
|
set_fake_editor
|
|
|
|
test_expect_success 'setup' '
|
|
test_commit "commit-new-file-F1" F1 1 &&
|
|
test_commit "commit-new-file-F2" F2 2 &&
|
|
|
|
git checkout -b topic HEAD^ &&
|
|
test_commit "commit-new-file-F2-on-topic-branch" F2 22 &&
|
|
|
|
git checkout master
|
|
'
|
|
|
|
test_expect_success 'interactive rebase --continue works with touched file' '
|
|
rm -fr .git/rebase-* &&
|
|
git reset --hard &&
|
|
git checkout master &&
|
|
|
|
FAKE_LINES="edit 1" git rebase -i HEAD^ &&
|
|
test-chmtime =-60 F1 &&
|
|
git rebase --continue
|
|
'
|
|
|
|
test_expect_success 'non-interactive rebase --continue works with touched file' '
|
|
rm -fr .git/rebase-* &&
|
|
git reset --hard &&
|
|
git checkout master &&
|
|
|
|
test_must_fail git rebase --onto master master topic &&
|
|
echo "Resolved" >F2 &&
|
|
git add F2 &&
|
|
test-chmtime =-60 F1 &&
|
|
git rebase --continue
|
|
'
|
|
|
|
test_expect_success 'rebase --continue can not be used with other options' '
|
|
test_must_fail git rebase -v --continue &&
|
|
test_must_fail git rebase --continue -v
|
|
'
|
|
|
|
test_expect_success 'rebase --continue remembers merge strategy and options' '
|
|
rm -fr .git/rebase-* &&
|
|
git reset --hard commit-new-file-F2-on-topic-branch &&
|
|
test_commit "commit-new-file-F3-on-topic-branch" F3 32 &&
|
|
test_when_finished "rm -fr test-bin funny.was.run" &&
|
|
mkdir test-bin &&
|
|
cat >test-bin/git-merge-funny <<-EOF &&
|
|
#!$SHELL_PATH
|
|
case "\$1" in --opt) ;; *) exit 2 ;; esac
|
|
shift &&
|
|
>funny.was.run &&
|
|
exec git merge-recursive "\$@"
|
|
EOF
|
|
chmod +x test-bin/git-merge-funny &&
|
|
(
|
|
PATH=./test-bin:$PATH
|
|
test_must_fail git rebase -s funny -Xopt master topic
|
|
) &&
|
|
test -f funny.was.run &&
|
|
rm funny.was.run &&
|
|
echo "Resolved" >F2 &&
|
|
git add F2 &&
|
|
(
|
|
PATH=./test-bin:$PATH
|
|
git rebase --continue
|
|
) &&
|
|
test -f funny.was.run
|
|
'
|
|
|
|
test_expect_success 'setup rerere database' '
|
|
rm -fr .git/rebase-* &&
|
|
git reset --hard commit-new-file-F3-on-topic-branch &&
|
|
git checkout master &&
|
|
test_commit "commit-new-file-F3" F3 3 &&
|
|
test_config rerere.enabled true &&
|
|
test_must_fail git rebase -m master topic &&
|
|
echo "Resolved" >F2 &&
|
|
cp F2 expected-F2 &&
|
|
git add F2 &&
|
|
test_must_fail git rebase --continue &&
|
|
echo "Resolved" >F3 &&
|
|
cp F3 expected-F3 &&
|
|
git add F3 &&
|
|
git rebase --continue &&
|
|
git reset --hard topic@{1}
|
|
'
|
|
|
|
prepare () {
|
|
rm -fr .git/rebase-* &&
|
|
git reset --hard commit-new-file-F3-on-topic-branch &&
|
|
git checkout master &&
|
|
test_config rerere.enabled true
|
|
}
|
|
|
|
test_rerere_autoupdate () {
|
|
action=$1 &&
|
|
test_expect_success "rebase $action --continue remembers --rerere-autoupdate" '
|
|
prepare &&
|
|
test_must_fail git rebase $action --rerere-autoupdate master topic &&
|
|
test_cmp expected-F2 F2 &&
|
|
git diff-files --quiet &&
|
|
test_must_fail git rebase --continue &&
|
|
test_cmp expected-F3 F3 &&
|
|
git diff-files --quiet &&
|
|
git rebase --continue
|
|
'
|
|
|
|
test_expect_success "rebase $action --continue honors rerere.autoUpdate" '
|
|
prepare &&
|
|
test_config rerere.autoupdate true &&
|
|
test_must_fail git rebase $action master topic &&
|
|
test_cmp expected-F2 F2 &&
|
|
git diff-files --quiet &&
|
|
test_must_fail git rebase --continue &&
|
|
test_cmp expected-F3 F3 &&
|
|
git diff-files --quiet &&
|
|
git rebase --continue
|
|
'
|
|
|
|
test_expect_success "rebase $action --continue remembers --no-rerere-autoupdate" '
|
|
prepare &&
|
|
test_config rerere.autoupdate true &&
|
|
test_must_fail git rebase $action --no-rerere-autoupdate master topic &&
|
|
test_cmp expected-F2 F2 &&
|
|
test_must_fail git diff-files --quiet &&
|
|
git add F2 &&
|
|
test_must_fail git rebase --continue &&
|
|
test_cmp expected-F3 F3 &&
|
|
test_must_fail git diff-files --quiet &&
|
|
git add F3 &&
|
|
git rebase --continue
|
|
'
|
|
}
|
|
|
|
test_rerere_autoupdate
|
|
test_rerere_autoupdate -m
|
|
GIT_SEQUENCE_EDITOR=: && export GIT_SEQUENCE_EDITOR
|
|
test_rerere_autoupdate -i
|
|
test_rerere_autoupdate --preserve-merges
|
|
|
|
test_done
|