Merge branch 'bc/hash-algo' into maint

diff --git a/merge-recursive.c b/merge-recursive.c
index 780f81a8bd3a729502cf2211a63135e4fba5d6cf..0fc580d8ca97c77d436f3351993300d19acd1ccc 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;