merge-recursive: do not look at the index during recursive merge

diff --git a/merge-recursive.c b/merge-recursive.c
index be01f528cb4849fc68c7f082e1d65709f86147d5..c571778f962a52092e916390a40c489b6746f20e 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -1954,7 +1954,7 @@ int merge_trees(struct merge_options *o,
        if (oid_eq(&common->object.oid, &merge->object.oid)) {
                struct strbuf sb = STRBUF_INIT;
 
-               if (index_has_changes(&sb)) {
+               if (!o->call_depth && index_has_changes(&sb)) {
                        err(o, _("Dirty index: cannot merge (dirty: %s)"),
                            sb.buf);
                        return 0;