From: Michael Haggerty Date: Wed, 19 Jun 2013 07:51:33 GMT Subject: [PATCH v2 12/12] refs: do not invalidate the packed-refs cache unnecessarily Message-ID: <1371628293-28824-13-git-send-email-mhagger@alum.mit.edu> In-Reply-To: <1371628293-28824-1-git-send-email-mhagger@alum.mit.edu> Now that we keep track of the packed-refs file metadata, we can detect when the packed-refs file has been modified since we last read it, and we do so automatically every time that get_packed_ref_cache() is called. So there is no need to invalidate the cache automatically when lock_packed_refs() is called; usually the old copy will still be valid. Signed-off-by: Michael Haggerty --- refs.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/refs.c b/refs.c index 350054c..4b989b0 100644 --- a/refs.c +++ b/refs.c @@ -2133,11 +2133,14 @@ int lock_packed_refs(struct lock_file *lock, int flags) { 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(lock, git_path("packed-refs"), flags) < 0) 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->lock = lock; /* Increment the reference count to prevent it from being freed: */ -- 1.8.3.1