From: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date: Mon, 28 Apr 2014 10:55:24 +0000 (+0700)
Subject: sequencer: do not update/refresh index if the lock cannot be held
X-Git-Tag: v2.1.0-rc0~45^2~29
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=33c297aacc0ce0f945198fbcdf48fbf2fd27d01b;p=thirdparty%2Fgit.git

sequencer: do not update/refresh index if the lock cannot be held

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/sequencer.c b/sequencer.c
index bde5f047b0..7b886a67dd 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));