diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-12-16 22:42:52 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-12-16 22:42:52 (GMT) |
| commit | f3adf457e046f92f039353762a78dcb3afb2cb13 (patch) | |
| tree | d88cafeeb77655862fd61def3256ce5eca2cb3b8 /t | |
| parent | 787407e5e05ef5cc8bcf15ccae01cd34bfd90573 (diff) | |
| parent | 040fd39e672fce2b549b842895ceb4f5063026f3 (diff) | |
| download | git-f3adf457e046f92f039353762a78dcb3afb2cb13.zip git-f3adf457e046f92f039353762a78dcb3afb2cb13.tar.gz git-f3adf457e046f92f039353762a78dcb3afb2cb13.tar.bz2 | |
Merge branch 'fr/rebase-i-continue-preserve-options'
"git rebase -i" started with merge strategy options did not
propagate them upon "git rebase --continue".
* fr/rebase-i-continue-preserve-options:
rebase -i: remember merge options beyond continue actions
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3404-rebase-interactive.sh | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index 9067e02..544f9ad 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -1006,6 +1006,22 @@ test_expect_success 'rebase -i with --strategy and -X' ' test $(cat file1) = Z ' +test_expect_success 'interrupted rebase -i with --strategy and -X' ' + git checkout -b conflict-merge-use-theirs-interrupted conflict-branch && + git reset --hard HEAD^ && + >breakpoint && + git add breakpoint && + git commit -m "breakpoint for interactive mode" && + echo five >conflict && + echo Z >file1 && + git commit -a -m "one file conflict" && + set_fake_editor && + FAKE_LINES="edit 1 2" git rebase -i --strategy=recursive -Xours conflict-branch && + git rebase --continue && + test $(git show conflict-branch:conflict) = $(cat conflict) && + test $(cat file1) = Z +' + test_expect_success 'rebase -i error on commits with \ in message' ' current_head=$(git rev-parse HEAD) && test_when_finished "git rebase --abort; git reset --hard $current_head; rm -f error" && |