Subject: [PATCH 03/32] sequencer: do not update/refresh index if the lock cannot be held

From: Nguyễn Thái Ngọc Duy <[email-masked]>
Date: Mon, 28 Apr 2014 17:55:24 +0700

Signed-off-by: Nguyễn Thái Ngọc Duy <[email-masked]>
---
 sequencer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sequencer.c b/sequencer.c
index bde5f04..7b886a6 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -679,7 +679,7 @@ static void read_and_refresh_cache(struct replay_opts *opts)
 	if (read_index_preload(&the_index, NULL) < 0)
 		die(_("git %s: failed to read the index"), action_name(opts));
 	refresh_index(&the_index, REFRESH_QUIET|REFRESH_UNMERGED, NULL, NULL, NULL);
-	if (the_index.cache_changed) {
+	if (the_index.cache_changed && index_fd >= 0) {
 		if (write_index(&the_index, index_fd) ||
 		    commit_locked_index(&index_lock))
 			die(_("git %s: failed to refresh the index"), action_name(opts));
-- 
1.9.1.346.ga2b5940