Merge branch 'jk/misc-resolve-ref-unsafe-fixes'

diff --git a/read-cache.c b/read-cache.c
index 0d8d2dedeed1e100dbf729d2af9a9674d75ced83..87188d390d8eafcb8deb9cd68a27eab340520e0d 100644 (file)
--- a/read-cache.c
+++ b/read-cache.c
@@ -2176,14 +2176,13 @@ static int has_racy_timestamp(struct index_state *istate)
        return 0;
 }
 
-/*
- * Opportunistically update the index but do not complain if we can't
- */
 void update_index_if_able(struct index_state *istate, struct lock_file *lockfile)
 {
        if ((istate->cache_changed || has_racy_timestamp(istate)) &&
            verify_index(istate))
                write_locked_index(istate, lockfile, COMMIT_LOCK);
+       else
+               rollback_lock_file(lockfile);
 }
 
 /*