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

Merge branch 'mh/ref-races-optim-invalidate-cached'

Browse Source 
* mh/ref-races-optim-invalidate-cached:
  refs: do not invalidate the packed-refs cache unnecessarily
This commit is contained in:
Junio C Hamano
2013-07-24 19:21:02 -07:00
parent 0c544a22f9 5d478f5ca1
commit 29143fc4e3
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
refs.c
View File

@ -2174,11 +2174,14 @@ int lock_packed_refs(int flags)
{ {
struct packed_ref_cache *packed_ref_cache; struct packed_ref_cache *packed_ref_cache;
/* Discard the old cache because it might be invalid: */
clear_packed_ref_cache(&ref_cache);
if (hold_lock_file_for_update(&packlock, git_path("packed-refs"), flags) < 0) if (hold_lock_file_for_update(&packlock, git_path("packed-refs"), flags) < 0)
return -1; return -1;
/* Read the current packed-refs while holding the lock: */ /*
* Get the current packed-refs while holding the lock. If the
* packed-refs file has been modified since we last read it,
* this will automatically invalidate the cache and re-read
* the packed-refs file.
*/
packed_ref_cache = get_packed_ref_cache(&ref_cache); packed_ref_cache = get_packed_ref_cache(&ref_cache);
packed_ref_cache->lock = &packlock; packed_ref_cache->lock = &packlock;
/* Increment the reference count to prevent it from being freed: */ /* Increment the reference count to prevent it from being freed: */