diff options
| author | Michael Haggerty <mhagger@alum.mit.edu> | 2017-06-23 09:01:24 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-23 13:27:32 -0700 |
| commit | 9c4fe0ff95a2d6245f6f0e52988d59f4131293b4 (patch) | |
| tree | d9dd8b99c3e6eaf958da48cb2869bd46b86edbef | |
| parent | 139c4596ad6fc1585574f27fde6dea28ab1d3a54 (diff) | |
| download | git-9c4fe0ff95a2d6245f6f0e52988d59f4131293b4.tar.gz | |
clear_packed_ref_cache(): take a `packed_ref_store *` parameter
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>
| -rw-r--r-- | refs/files-backend.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/refs/files-backend.c b/refs/files-backend.c index de8293493f..2b0db60b2b 100644 --- a/refs/files-backend.c +++ b/refs/files-backend.c @@ -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) { - struct packed_ref_cache *packed_refs = refs->packed_ref_store->cache; + if (refs->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"); - refs->packed_ref_store->cache = NULL; - release_packed_ref_cache(packed_refs); + refs->cache = NULL; + 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 && !stat_validity_check(&refs->packed_ref_store->cache->validity, 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"); rollback_lock_file(&refs->packed_ref_store->lock); release_packed_ref_cache(packed_ref_cache); - clear_packed_ref_cache(refs); + clear_packed_ref_cache(refs->packed_ref_store); } struct ref_to_prune { |