Hi, the following test case exhibits behavior which I think is a bug. If merge-one-file cannot handle the merge we end up with unmerged index entries and no MERGE_HEAD created. I suppose that MERGE_HEAD should be created whenever a merge fails. If someone gives me a hint how to correct this, I can try to do it. Signed-off-by: Michal Sojka <sojkam1@xxxxxxxxxxx> --- t/t7611-merge-octopus-fail.sh | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/t/t7611-merge-octopus-fail.sh b/t/t7611-merge-octopus-fail.sh new file mode 100755 index 0000000..b7f983b --- /dev/null +++ b/t/t7611-merge-octopus-fail.sh @@ -0,0 +1,29 @@ +#!/bin/sh + +test_description='git merge + +Testing octopus merge with one file changed and deleted on different branches. +' + +. ./test-lib.sh + +test_expect_success 'setup' ' + test_commit initial file && + test_commit changed file && + git reset --hard initial -- && + git rm file && + git commit -m deleted && + git tag deleted && + git reset --hard initial -- && + test_commit file2 +' +test_expect_success 'failed octopus merge' ' + git reset --hard changed && + test_must_fail git merge deleted file2 +' + +test_expect_failure 'check that MERGE_HEAD exists' ' + test -f .git/MERGE_HEAD +' + +test_done -- tg: (90a2bf9..) t/test-failed-octopus-merge (depends on: master) -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html