undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

validate_packed_ref_cache(): take a packed_ref_store * parameter

Browse Source 
It only cares about the packed-refs part of the reference store.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Michael Haggerty 2017-06-23 09:01:25 +02:00 committed by Junio C Hamano
parent 9c4fe0ff95
commit 25e0c5faf2
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
refs/files-backend.c
View File

@ -396,12 +396,11 @@ static void files_ref_path(struct files_ref_store *refs,
* Check that the packed refs cache (if any) still reflects the * Check that the packed refs cache (if any) still reflects the
* contents of the file. If not, clear the cache. * contents of the file. If not, clear the cache.
*/ */
static void validate_packed_ref_cache(struct files_ref_store *refs) static void validate_packed_ref_cache(struct packed_ref_store *refs)
{ {
if (refs->packed_ref_store->cache && if (refs->cache &&
!stat_validity_check(&refs->packed_ref_store->cache->validity, !stat_validity_check(&refs->cache->validity, refs->path))
refs->packed_ref_store->path)) clear_packed_ref_cache(refs);
clear_packed_ref_cache(refs->packed_ref_store);
} }
/* /*
@ -417,7 +416,7 @@ static struct packed_ref_cache *get_packed_ref_cache(struct files_ref_store *ref
const char *packed_refs_file = refs->packed_ref_store->path; const char *packed_refs_file = refs->packed_ref_store->path;
if (!is_lock_file_locked(&refs->packed_ref_store->lock)) if (!is_lock_file_locked(&refs->packed_ref_store->lock))
validate_packed_ref_cache(refs); validate_packed_ref_cache(refs->packed_ref_store);
if (!refs->packed_ref_store->cache) if (!refs->packed_ref_store->cache)
refs->packed_ref_store->cache = read_packed_refs(packed_refs_file); refs->packed_ref_store->cache = read_packed_refs(packed_refs_file);
@ -1364,7 +1363,7 @@ static int lock_packed_refs(struct files_ref_store *refs, int flags)
* cache is still valid. We've just locked the file, but it * cache is still valid. We've just locked the file, but it
* might have changed the moment *before* we locked it. * might have changed the moment *before* we locked it.
*/ */
validate_packed_ref_cache(refs); validate_packed_ref_cache(refs->packed_ref_store);
packed_ref_cache = get_packed_ref_cache(refs); packed_ref_cache = get_packed_ref_cache(refs);
/* Increment the reference count to prevent it from being freed: */ /* Increment the reference count to prevent it from being freed: */