merge: abort if index does not match HEAD for trivial merges

As noted in the last commit and the links therein (especially commit
9822175d2b ("Ensure index matches head before invoking merge machinery,
round N", 2019-08-17), we have had a very long history of problems with
failing to enforce the requirement that index matches HEAD when starting
a merge.

The "trivial merge" logic in builtin/merge.c is yet another such case
we previously missed.  Add a check for it to ensure it aborts if the
index does not match HEAD, and add a testcase where this fix is needed.

Note that the fix here would also incidentally be an alternative fix
for the testcase added in the last patch, but the fix in the last patch
is still needed when multiple merge strategies are in use, so tweak the
testcase from the previous commit so that it continues to exercise the
codepath added in the last commit.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/merge.c b/builtin/merge.c
index 23170f2d2a644c2ace8899bf32b4ea642dbf2384..b43876f68e44262bb7eab6c5cd8f3e5e937ef964 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -1599,6 +1599,21 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
                 */
                refresh_cache(REFRESH_QUIET);
                if (allow_trivial && fast_forward != FF_ONLY) {
+                       /*
+                        * Must first ensure that index matches HEAD before
+                        * attempting a trivial merge.
+                        */
+                       struct tree *head_tree = get_commit_tree(head_commit);
+                       struct strbuf sb = STRBUF_INIT;
+
+                       if (repo_index_has_changes(the_repository, head_tree,
+                                                  &sb)) {
+                               error(_("Your local changes to the following files would be overwritten by merge:\n  %s"),
+                                     sb.buf);
+                               strbuf_release(&sb);
+                               return 2;
+                       }
+
                        /* See if it is really trivial. */
                        git_committer_info(IDENT_STRICT);
                        printf(_("Trying really trivial in-index merge...\n"));

diff --git a/t/t6424-merge-unrelated-index-changes.sh b/t/t6424-merge-unrelated-index-changes.sh
index eabe6bda83234403c177af37c39fd572d5574c29..187c761ad84f04f51b5b7026505956cd96e2c04e 100755 (executable)
--- a/t/t6424-merge-unrelated-index-changes.sh
+++ b/t/t6424-merge-unrelated-index-changes.sh
@@ -114,6 +114,19 @@ test_expect_success 'resolve, non-trivial' '
        test_path_is_missing .git/MERGE_HEAD
 '
 
+test_expect_success 'resolve, trivial, related file removed' '
+       git reset --hard &&
+       git checkout B^0 &&
+
+       git rm a &&
+       test_path_is_missing a &&
+
+       test_must_fail git merge -s resolve C^0 &&
+
+       test_path_is_missing a &&
+       test_path_is_missing .git/MERGE_HEAD
+'
+
 test_expect_success 'resolve, non-trivial, related file removed' '
        git reset --hard &&
        git checkout B^0 &&
@@ -121,7 +134,14 @@ test_expect_success 'resolve, non-trivial, related file removed' '
        git rm a &&
        test_path_is_missing a &&
 
-       test_must_fail git merge -s resolve D^0 &&
+       # We also ask for recursive in order to turn off the "allow_trivial"
+       # setting in builtin/merge.c, and ensure that resolve really does
+       # correctly fail the merge (I guess this also tests that recursive
+       # correctly fails the merge, but the main thing we are attempting
+       # to test here is resolve and are just using the side effect of
+       # adding recursive to ensure that resolve is actually tested rather
+       # than the trivial merge codepath)
+       test_must_fail git merge -s resolve -s recursive D^0 &&
 
        test_path_is_missing a &&
        test_path_is_missing .git/MERGE_HEAD