44 lines
913 B
Bash
44 lines
913 B
Bash
|
#!/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_done
|