pack_if_possible_fn(): use ref_type() instead of is_per_worktree_ref()
is_per_worktree_ref() will soon be made private, so use the public interface, ref_type(), in its place. And now that we're using ref_type(), we can make it clear that we won't pack pseudorefs. This was the case before, but due to the not-so-obvious reason that this function is applied to references via the loose reference cache, which only includes references that live inside "refs/". Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Jeff King <peff@peff.net>
Michael Haggerty committed
Nov 10, 2015 at 12:42 UTC
a935ebd4a7df505da819371ef10add6ad7bd77d7
1 file changed
+1
-3
refs.c
+1
-3
@@ -2671,8 +2671,6 @@ struct pack_refs_cb_data {
2671
struct ref_to_prune *ref_to_prune;
2672
};
2673
2674
-static int is_per_worktree_ref(const char *refname);
2675
-
2674
/*
2675
* An each_ref_entry_fn that is run over loose references only. If
2676
* the loose reference can be packed, add an entry in the packed ref
@@ -2687,7 +2685,7 @@ static int pack_if_possible_fn(struct ref_entry *entry, void *cb_data)
2685
int is_tag_ref = starts_with(entry->name, "refs/tags/");
2686
2687
/* Do not pack per-worktree refs: */
2690
- if (is_per_worktree_ref(entry->name))
2688
+ if (ref_type(entry->name) != REF_TYPE_NORMAL)
2689
return 0;
2690
2691
/* ALWAYS pack tags */