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

clear_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:24 +02:00 committed by Junio C Hamano
parent 139c4596ad
commit 9c4fe0ff95
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
refs/files-backend.c
View File

@ -120,15 +120,15 @@ static int release_packed_ref_cache(struct packed_ref_cache *packed_refs)
} }
} }
static void clear_packed_ref_cache(struct files_ref_store *refs) static void clear_packed_ref_cache(struct packed_ref_store *refs)
{ {
if (refs->packed_ref_store->cache) { if (refs->cache) {
struct packed_ref_cache *packed_refs = refs->packed_ref_store->cache; struct packed_ref_cache *cache = refs->cache;
if (is_lock_file_locked(&refs->packed_ref_store->lock)) if (is_lock_file_locked(&refs->lock))
die("BUG: packed-ref cache cleared while locked"); die("BUG: packed-ref cache cleared while locked");
refs->packed_ref_store->cache = NULL; refs->cache = NULL;
release_packed_ref_cache(packed_refs); release_packed_ref_cache(cache);
} }
} }
@ -401,7 +401,7 @@ static void validate_packed_ref_cache(struct files_ref_store *refs)
if (refs->packed_ref_store->cache && if (refs->packed_ref_store->cache &&
!stat_validity_check(&refs->packed_ref_store->cache->validity, !stat_validity_check(&refs->packed_ref_store->cache->validity,
refs->packed_ref_store->path)) refs->packed_ref_store->path))
clear_packed_ref_cache(refs); clear_packed_ref_cache(refs->packed_ref_store);
} }
/* /*
@ -1435,7 +1435,7 @@ static void rollback_packed_refs(struct files_ref_store *refs)
die("BUG: packed-refs not locked"); die("BUG: packed-refs not locked");
rollback_lock_file(&refs->packed_ref_store->lock); rollback_lock_file(&refs->packed_ref_store->lock);
release_packed_ref_cache(packed_ref_cache); release_packed_ref_cache(packed_ref_cache);
clear_packed_ref_cache(refs); clear_packed_ref_cache(refs->packed_ref_store);
} }
struct ref_to_prune { struct ref_to_prune {