diff/status: refactor opportunistic index update

[git.git] / read-cache.c

diff --git a/read-cache.c b/read-cache.c
index 1f42473e8070a05ada8c56b0d60537227a5223ec..7a0421cba47bf370ac3d6ef560da60ecb6c36b21 100644 (file)
--- a/read-cache.c
+++ b/read-cache.c
@@ -1545,6 +1545,18 @@ static int ce_write_entry(git_SHA_CTX *c, int fd, struct cache_entry *ce)
        return result;
 }
 
+/*
+ * Opportunisticly 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 &&
+           !write_index(istate, lockfile->fd))
+               commit_locked_index(lockfile);
+       else
+               rollback_lock_file(lockfile);
+}
+
 int write_index(struct index_state *istate, int newfd)
 {
        git_SHA_CTX c;