diff options
| author |  Elijah Newren <newren@gmail.com> | 2018-07-10 20:56:59 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-07-11 09:40:04 -0700 |
| commit | 587421ebddec17e6e9aaf55b61aa40ad4ad9e43e (patch) | |
| tree | a3e63b7199c71359280199aa0b0c0015001f4228 /t | |
| parent | t7405: add a directory/submodule conflict (diff) | |
| download | tgif-587421ebddec17e6e9aaf55b61aa40ad4ad9e43e.tar.xz | |
t7405: verify 'merge --abort' works after submodule/path conflicts
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7405-submodule-merge.sh | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/t/t7405-submodule-merge.sh b/t/t7405-submodule-merge.sh index 45d1779d29..7855bd8648 100755 --- a/t/t7405-submodule-merge.sh +++ b/t/t7405-submodule-merge.sh @@ -333,6 +333,19 @@ test_expect_failure 'file/submodule conflict' ' ) ' +test_expect_success 'file/submodule conflict; merge --abort works afterward' ' + test_when_finished "git -C file-submodule reset --hard" && + ( + cd file-submodule && + + git checkout A^0 && + test_must_fail git merge B^0 >out 2>err && + + test_path_is_file .git/MERGE_HEAD && + git merge --abort + ) +' + # Directory/submodule conflict # Commit O: <empty> # Commit A: path (submodule), with sole tracked file named 'world' @@ -417,7 +430,25 @@ test_expect_failure 'directory/submodule conflict; should not treat submodule fi # merge from starting; we should not be writing to such paths # anyway. test_i18ngrep ! "refusing to lose untracked file at" err + ) +' + +test_expect_failure 'directory/submodule conflict; merge --abort works afterward' ' + test_when_finished "git -C directory-submodule/path reset --hard" && + test_when_finished "git -C directory-submodule reset --hard" && + ( + cd directory-submodule && + git checkout A^0 && + test_must_fail git merge B2^0 && + test_path_is_file .git/MERGE_HEAD && + + # merge --abort should succeed, should clear .git/MERGE_HEAD, + # and should not leave behind any conflicted files + git merge --abort && + test_path_is_missing .git/MERGE_HEAD && + git ls-files -u >conflicts && + test_must_be_empty conflicts ) ' |