3 test_description
='git rebase --continue tests'
7 .
"$TEST_DIRECTORY"/lib-rebase.sh
11 test_expect_success
'setup' '
12 test_commit "commit-new-file-F1" F1 1 &&
13 test_commit "commit-new-file-F2" F2 2 &&
15 git checkout -b topic HEAD^ &&
16 test_commit "commit-new-file-F2-on-topic-branch" F2 22 &&
21 test_expect_success
'interactive rebase --continue works with touched file' '
22 rm -fr .git/rebase-* &&
24 git checkout master &&
26 FAKE_LINES="edit 1" git rebase -i HEAD^ &&
27 test-chmtime =-60 F1 &&
31 test_expect_success
'non-interactive rebase --continue works with touched file' '
32 rm -fr .git/rebase-* &&
34 git checkout master &&
36 test_must_fail git rebase --onto master master topic &&
37 echo "Resolved" >F2 &&
39 test-chmtime =-60 F1 &&