Skip to content

Commit

Permalink
pack_if_possible_fn(): use ref_type() instead of is_per_worktree_ref()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Michael Haggerty authored and Jeff King committed Nov 20, 2015
1 parent f4a5721 commit a935ebd
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions refs.c
Original file line number Diff line number Diff line change
Expand Up @@ -2671,8 +2671,6 @@ struct pack_refs_cb_data {
struct ref_to_prune *ref_to_prune;
};

static int is_per_worktree_ref(const char *refname);

/*
* An each_ref_entry_fn that is run over loose references only. If
* the loose reference can be packed, add an entry in the packed ref
Expand All @@ -2687,7 +2685,7 @@ static int pack_if_possible_fn(struct ref_entry *entry, void *cb_data)
int is_tag_ref = starts_with(entry->name, "refs/tags/");

/* Do not pack per-worktree refs: */
if (is_per_worktree_ref(entry->name))
if (ref_type(entry->name) != REF_TYPE_NORMAL)
return 0;

/* ALWAYS pack tags */
Expand Down

0 comments on commit a935ebd

Please sign in to comment.