global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-14 02:43:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'js/c-merge-recursive' into next

Browse Source 
* js/c-merge-recursive:
  discard_cache(): discard index, even if no file was mmap()ed
This commit is contained in:
Junio C Hamano
2006-08-10 15:38:31 -07:00
parent 10f35d6e8a 4147d801db
commit 2f274a5173
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
read-cache.c
View File

@@ -841,14 +841,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;