From: Elijah Newren Date: Sat, 07 Jul 2018 20:44:04 GMT Subject: [PATCH 3/3] t7405: verify 'merge --abort' works after submodule/path conflicts Message-ID: <20180707204404.7208-4-newren@gmail.com> In-Reply-To: <20180707204404.7208-1-newren@gmail.com> Signed-off-by: Elijah Newren --- t/t7405-submodule-merge.sh | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/t/t7405-submodule-merge.sh b/t/t7405-submodule-merge.sh index 6cb51c966..9f71a4859 100755 --- a/t/t7405-submodule-merge.sh +++ b/t/t7405-submodule-merge.sh @@ -335,6 +335,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: # Commit A: path (submodule), with sole tracked file named 'world' @@ -422,7 +435,20 @@ 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 >out 2>err && + test_path_is_file .git/MERGE_HEAD && + git merge --abort ) ' -- 2.18.0.134.gafc206209.dirty