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

Merge branch 'maint'

Browse Source 
* maint:
  unpack_trees(): protect the handcrafted in-core index from read_cache()
  git-p4: Fix one-liner in p4_write_pipe function.
  Completion: add missing '=' for 'diff --diff-filter'
  Fix 'git help help'
This commit is contained in:
Junio C Hamano
2008-08-23 18:28:37 -07:00
parent a7b3269c4b 913e0e99b6
commit d6096f17d2
6 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
read-cache.c
View File

@ -1159,7 +1159,7 @@ int read_index_from(struct index_state *istate, const char *path)
size_t mmap_size;
errno = EBUSY;
if (istate->alloc)
if (istate->initialized)
return istate->cache_nr;
errno = ENOENT;
@ -1199,6 +1199,7 @@ int read_index_from(struct index_state *istate, const char *path)
* index size
*/
istate->alloc = xmalloc(estimate_cache_size(mmap_size, istate->cache_nr));
istate->initialized = 1;
src_offset = sizeof(*hdr);
dst_offset = 0;
@ -1251,6 +1252,7 @@ int discard_index(struct index_state *istate)
cache_tree_free(&(istate->cache_tree));
free(istate->alloc);
istate->alloc = NULL;
istate->initialized = 0;
/* no need to throw away allocated active_cache */
return 0;