diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-11-18 18:23:56 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-18 18:23:56 +0900 |
| commit | 0de3a73eb6b36d5b8df82e62dd5679462f19edef (patch) | |
| tree | 5a27d9b14c9768766c8ae81020a5904e0c6a6b36 /t | |
| parent | Merge branch 'js/apply-recount-allow-noop' (diff) | |
| parent | status: rebase and merge can be in progress at the same time (diff) | |
| download | tgif-0de3a73eb6b36d5b8df82e62dd5679462f19edef.tar.xz | |
Merge branch 'js/rebase-r-and-merge-head'
Bugfix for the recently graduated "git rebase --rebase-merges".
* js/rebase-r-and-merge-head:
status: rebase and merge can be in progress at the same time
built-in rebase --skip/--abort: clean up stale .git/<name> files
rebase -i: include MERGE_HEAD into files to clean up
rebase -r: do not write MERGE_HEAD unless needed
rebase -r: demonstrate bug with conflicting merges
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3430-rebase-merges.sh | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/t/t3430-rebase-merges.sh b/t/t3430-rebase-merges.sh index aa7bfc88ec..cc5646836f 100755 --- a/t/t3430-rebase-merges.sh +++ b/t/t3430-rebase-merges.sh @@ -396,4 +396,20 @@ test_expect_success 'with --autosquash and --exec' ' grep "G: +G" actual ' +test_expect_success '--continue after resolving conflicts after a merge' ' + git checkout -b already-has-g E && + git cherry-pick E..G && + test_commit H2 && + + git checkout -b conflicts-in-merge H && + test_commit H2 H2.t conflicts H2-conflict && + test_must_fail git rebase -r already-has-g && + grep conflicts H2.t && + echo resolved >H2.t && + git add -u && + git rebase --continue && + test_must_fail git rev-parse --verify HEAD^2 && + test_path_is_missing .git/MERGE_HEAD +' + test_done |