undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

name-rev: extract creating/updating a 'struct name_rev' into a helper

Browse Source 
In a later patch in this series we'll want to do this in two places.

Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
SZEDER Gábor 2019-11-12 11:38:15 +01:00 committed by Junio C Hamano
parent d59fc83697
commit 766f9e39c0
1 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
builtin/name-rev.c
View File

@ -79,12 +79,36 @@ static int is_better_name(struct rev_name *name,
return 0; return 0;
} }
static struct rev_name *create_or_update_name(struct commit *commit,
const char *tip_name,
timestamp_t taggerdate,
int generation, int distance,
int from_tag)
{
struct rev_name *name = get_commit_rev_name(commit);
if (name == NULL) {
name = xmalloc(sizeof(*name));
set_commit_rev_name(commit, name);
goto copy_data;
} else if (is_better_name(name, taggerdate, distance, from_tag)) {
copy_data:
name->tip_name = tip_name;
name->taggerdate = taggerdate;
name->generation = generation;
name->distance = distance;
name->from_tag = from_tag;
return name;
} else
return NULL;
}
static void name_rev(struct commit *commit, static void name_rev(struct commit *commit,
const char *tip_name, timestamp_t taggerdate, const char *tip_name, timestamp_t taggerdate,
int generation, int distance, int from_tag, int generation, int distance, int from_tag,
int deref) int deref)
{ {
struct rev_name *name = get_commit_rev_name(commit);
struct commit_list *parents; struct commit_list *parents;
int parent_number = 1; int parent_number = 1;
char *to_free = NULL; char *to_free = NULL;
@ -101,18 +125,8 @@ static void name_rev(struct commit *commit,
die("generation: %d, but deref?", generation); die("generation: %d, but deref?", generation);
} }
if (name == NULL) { if (!create_or_update_name(commit, tip_name, taggerdate, generation,
name = xmalloc(sizeof(*name)); distance, from_tag)) {
set_commit_rev_name(commit, name);
goto copy_data;
} else if (is_better_name(name, taggerdate, distance, from_tag)) {
copy_data:
name->tip_name = tip_name;
name->taggerdate = taggerdate;
name->generation = generation;
name->distance = distance;
name->from_tag = from_tag;
} else {
free(to_free); free(to_free);
return; return;
} }