refs: inline function do_not_prune()
Function do_not_prune() was redundantly checking REF_ISSYMREF, which was already tested at the top of pack_one_ref(), so remove that check. And the rest was trivial, so inline the function. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Michael Haggerty committed
Apr 22, 2013 at 21:52 UTC
8d3725b96fa6878fabe5ec715ff7b9f263481ea1
1 file changed
+2
-9
refs.c
+2
-9
@@ -1996,14 +1996,6 @@ struct pack_refs_cb_data {
1996
FILE *refs_file;
1997
};
1998
1999
-static int do_not_prune(int flags)
2000
-{
2001
- /* If it is already packed or if it is a symref,
2002
- * do not prune it.
2003
- */
2004
- return (flags & (REF_ISSYMREF|REF_ISPACKED));
2005
-}
2006
-
1999
static int pack_one_ref(struct ref_entry *entry, void *cb_data)
2000
{
2001
struct pack_refs_cb_data *cb = cb_data;
@@ -2031,7 +2023,8 @@ static int pack_one_ref(struct ref_entry *entry, void *cb_data)
2023
sha1_to_hex(o->sha1));
2024
}
2025
2034
- if ((cb->flags & PACK_REFS_PRUNE) && !do_not_prune(entry->flag)) {
2026
+ /* If the ref was already packed, there is no need to prune it. */
2027
+ if ((cb->flags & PACK_REFS_PRUNE) && !(entry->flag & REF_ISPACKED)) {
2028
int namelen = strlen(entry->name) + 1;
2029
struct ref_to_prune *n = xcalloc(1, sizeof(*n) + namelen);
2030
hashcpy(n->sha1, entry->u.value.sha1);