[PATCH] merge-recur: do not die unnecessarily

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Aug 9, 2006, 20:31 UTC
Message-ID: <Pine.LNX.4.63.0608092231260.13885@wbgn013.biozentrum.uni-wuerzburg.de>

When the cache is dirty, and we switch the index file from temporary to final, we want to discard the cache without complaint.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 merge-recursive.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/merge-recursive.c b/merge-recursive.c
index 2d3ab4f..be97752 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -139,8 +139,10 @@ static int flush_cache(void)
 static void setup_index(int temp)
 {
 	current_index_file = temp ? temporary_index_file: original_index_file;
-	if (cache_dirty)
-		die("fatal: cache changed flush_cache();");
+	if (cache_dirty) {
+		discard_cache();
+		cache_dirty = 0;
+	}
 	unlink(temporary_index_file);
 	discard_cache();
 }

-- 
1.4.2.rc3.g29d0-dirty