undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t7405: verify 'merge --abort' works after submodule/path conflicts

Browse Source 
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Elijah Newren 2018-07-10 20:56:59 -07:00 committed by Junio C Hamano
parent e81c7d4145
commit 587421ebdd
1 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
t/t7405-submodule-merge.sh
View File

@ -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
)
'