Ensure that mergetool.keepTemporaries is honored when resolving delete/delete conflicts.
Ensure that stderr stays empty, and that worktree directories created by mergetool to are removed. Signed-off-by: David Aguilar <[email protected]> --- t/t7610-mergetool.sh | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh index f1668be..cf2eceb 100755 --- a/t/t7610-mergetool.sh +++ b/t/t7610-mergetool.sh @@ -273,6 +273,40 @@ test_expect_success 'mergetool delete/delete conflict' ' git reset --hard HEAD ' +test_expect_success 'mergetool honors tempfile config for deleted files' ' + test_config mergetool.keepTemporaries false && + ! git merge move-to-b && + echo d | git mergetool a/a/file.txt && + ! test -d a && + git reset --hard HEAD +' + +test_expect_success 'mergetool produces no errors when keepBackup is used' ' + test_config mergetool.keepBackup true && + ! git merge move-to-b && + : >expect && + echo d | git mergetool a/a/file.txt 2>actual && + test_cmp expect actual && + ! test -d a && + git reset --hard HEAD +' + +test_expect_success 'mergetool keeps tempfiles when aborting delete/delete' ' + test_config mergetool.keepTemporaries true && + ! git merge move-to-b && + ! (echo a; echo n) | git mergetool a/a/file.txt && + test -d a/a && + cat >expect <<\-EOF && +file_BASE_.txt +file_LOCAL_.txt +file_REMOTE_.txt +-EOF + ls -1 a/a | sed -e "s/[0-9]*//g" >actual && + test_cmp expect actual && + git clean -fdx && + git reset --hard HEAD +' + test_expect_success 'deleted vs modified submodule' ' git checkout -b test6 branch1 && git submodule update -N && -- 2.8.0.rc1.3.g475af66.dirty -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
