Merge branch 'ml/filter-branch-no-op-error' into next

diff --git a/merge-recursive.c b/merge-recursive.c
index 5282fc1c2596e5cfaea2450fb53d0298ab1d8d21..8fa7efee2fd3ade38de97d36aad9c584aa0c49be 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -3244,10 +3244,9 @@ int merge_recursive_generic(struct merge_options *o,
                return clean;
        }
 
-       if (active_cache_changed &&
-           write_locked_index(&the_index, &lock, COMMIT_LOCK))
+       if (write_locked_index(&the_index, &lock,
+                              COMMIT_LOCK | SKIP_IF_UNCHANGED))
                return err(o, _("Unable to write index."));
-       rollback_lock_file(&lock);
 
        return clean ? 0 : 1;
 }