mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge-recur: do not die unnecessarily

Browse Source 
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>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Johannes Schindelin
2006-08-09 22:31:49 +02:00
committed by Junio C Hamano
parent 8918b0c9c2
commit 984b65707e
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
merge-recursive.c
View File

@ -139,8 +139,10 @@ static int flush_cache(void)
static void setup_index(int temp) static void setup_index(int temp)
{ {
current_index_file = temp ? temporary_index_file: original_index_file; current_index_file = temp ? temporary_index_file: original_index_file;
if (cache_dirty) if (cache_dirty) {
die("fatal: cache changed flush_cache();"); discard_cache();
cache_dirty = 0;
}
unlink(temporary_index_file); unlink(temporary_index_file);
discard_cache(); discard_cache();
} }