clear_packed_ref_cache(): take a packed_ref_store * parameter

mhagger · gitster · commit 9c4fe0ff95a2 · 2017-06-23T13:27:32.000-07:00
It only cares about the packed-refs part of the reference store.

Signed-off-by: Michael Haggerty &lt;mhagger@alum.mit.edu&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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 {

Original file line number	Diff line number	Diff line change
`@@ -120,15 +120,15 @@ static int release_packed_ref_cache(struct packed_ref_cache *packed_refs)`
`120`	`120`	`}`
`121`	`121`	`}`
`122`	`122`
`123`		`-static void clear_packed_ref_cache(struct files_ref_store *refs)`
	`123`	`+static void clear_packed_ref_cache(struct packed_ref_store *refs)`
`124`	`124`	`{`
`125`		`- if (refs->packed_ref_store->cache) {`
`126`		`- struct packed_ref_cache *packed_refs = refs->packed_ref_store->cache;`
	`125`	`+ if (refs->cache) {`
	`126`	`+ struct packed_ref_cache *cache = refs->cache;`
`127`	`127`
`128`		`- if (is_lock_file_locked(&refs->packed_ref_store->lock))`
	`128`	`+ if (is_lock_file_locked(&refs->lock))`
`129`	`129`	`die("BUG: packed-ref cache cleared while locked");`
`130`		`- refs->packed_ref_store->cache = NULL;`
`131`		`- release_packed_ref_cache(packed_refs);`
	`130`	`+ refs->cache = NULL;`
	`131`	`+ release_packed_ref_cache(cache);`
`132`	`132`	`}`
`133`	`133`	`}`
`134`	`134`
`@@ -401,7 +401,7 @@ static void validate_packed_ref_cache(struct files_ref_store *refs)`
`401`	`401`	`if (refs->packed_ref_store->cache &&`
`402`	`402`	`!stat_validity_check(&refs->packed_ref_store->cache->validity,`
`403`	`403`	`refs->packed_ref_store->path))`
`404`		`- clear_packed_ref_cache(refs);`
	`404`	`+ clear_packed_ref_cache(refs->packed_ref_store);`
`405`	`405`	`}`
`406`	`406`
`407`	`407`	`/*`
`@@ -1435,7 +1435,7 @@ static void rollback_packed_refs(struct files_ref_store *refs)`
`1435`	`1435`	`die("BUG: packed-refs not locked");`
`1436`	`1436`	`rollback_lock_file(&refs->packed_ref_store->lock);`
`1437`	`1437`	`release_packed_ref_cache(packed_ref_cache);`
`1438`		`- clear_packed_ref_cache(refs);`
	`1438`	`+ clear_packed_ref_cache(refs->packed_ref_store);`
`1439`	`1439`	`}`
`1440`	`1440`
`1441`	`1441`	`struct ref_to_prune {`