Merge branch 'ab/nuke-emacs-contrib' into next

diff --git a/read-cache.c b/read-cache.c
index 977921d90c65ea94b40cb7f8332246bf77c0f215..d05eb725b533d3b70daca910df60d27de9ce947c 100644 (file)
--- a/read-cache.c
+++ b/read-cache.c
@@ -2538,6 +2538,12 @@ int write_locked_index(struct index_state *istate, struct lock_file *lock,
        int new_shared_index, ret;
        struct split_index *si = istate->split_index;
 
+       if ((flags & SKIP_IF_UNCHANGED) && !istate->cache_changed) {
+               if (flags & COMMIT_LOCK)
+                       rollback_lock_file(lock);
+               return 0;
+       }
+
        if (istate->fsmonitor_last_update)
                fill_fsmonitor_bitmap(istate);