From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Date: Thu, 10 Aug 2006 14:47:21 +0000 (+0200)
Subject: discard_cache(): discard index, even if no file was mmap()ed
X-Git-Tag: v1.4.3-rc1~174^2~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4147d801db66df9b127ffe315601f467aa9d1c48;p=git.git

discard_cache(): discard index, even if no file was mmap()ed

Since add_cacheinfo() can be called without a mapped index file,
discard_cache() _has_ to discard the entries, even when
cache_mmap == NULL.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/read-cache.c b/read-cache.c
index c375e912a..fc2af2cb0 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -840,14 +840,14 @@ int discard_cache()
 {
 	int ret;
 
+	active_nr = active_cache_changed = 0;
+	index_file_timestamp = 0;
+	cache_tree_free(&active_cache_tree);
 	if (cache_mmap == NULL)
 		return 0;
 	ret = munmap(cache_mmap, cache_mmap_size);
 	cache_mmap = NULL;
 	cache_mmap_size = 0;
-	active_nr = active_cache_changed = 0;
-	index_file_timestamp = 0;
-	cache_tree_free(&active_cache_tree);
 
 	/* no need to throw away allocated active_cache */
 	return ret;