mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

name-rev: don't _peek() in create_or_update_name()

Browse Source 
Look up the commit slab slot for the commit once using
commit_rev_name_at() and populate it in case it is empty, instead of
checking for emptiness in a separate step using commit_rev_name_peek()
via get_commit_rev_name().

Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
René Scharfe
2020-02-04 22:20:42 +01:00
committed by Junio C Hamano
parent 15a4205d96
commit d689d6d82f
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
builtin/name-rev.c
View File

@ -39,11 +39,6 @@ static struct rev_name *get_commit_rev_name(const struct commit *commit)
return slot ? *slot : NULL; return slot ? *slot : NULL;
} }
static void set_commit_rev_name(struct commit *commit, struct rev_name *name)
{
*commit_rev_name_at(&rev_names, commit) = name;
}
static int is_better_name(struct rev_name *name, static int is_better_name(struct rev_name *name,
timestamp_t taggerdate, timestamp_t taggerdate,
int distance, int distance,
@ -86,15 +81,14 @@ static struct rev_name *create_or_update_name(struct commit *commit,
int generation, int distance, int generation, int distance,
int from_tag) int from_tag)
{ {
struct rev_name *name = get_commit_rev_name(commit); struct rev_name **slot = commit_rev_name_at(&rev_names, commit);
struct rev_name *name = *slot;
if (name && !is_better_name(name, taggerdate, distance, from_tag)) if (name && !is_better_name(name, taggerdate, distance, from_tag))
return NULL; return NULL;
if (name == NULL) { if (!name)
name = xmalloc(sizeof(*name)); name = *slot = xmalloc(sizeof(*name));
set_commit_rev_name(commit, name);
}
name->tip_name = tip_name; name->tip_name = tip_name;
name->taggerdate = taggerdate; name->taggerdate = taggerdate;