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

name-rev: factor out get_parent_name()

Browse Source 
Reduce nesting by moving code to come up with a name for the parent into
its own function.

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:23:29 +01:00 committed by Junio C Hamano
parent f13ca7cef5
commit ddc42ec786
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
builtin/name-rev.c
View File

@ -101,6 +101,19 @@ static struct rev_name *create_or_update_name(struct commit *commit,
return name;
}
static char *get_parent_name(const struct rev_name *name, int parent_number)
{
size_t len;
strip_suffix(name->tip_name, "^0", &len);
if (name->generation > 0)
return xstrfmt("%.*s~%d^%d", (int)len, name->tip_name,
name->generation, parent_number);
else
return xstrfmt("%.*s^%d", (int)len, name->tip_name,
parent_number);
}
static void name_rev(struct commit *start_commit,
const char *tip_name, timestamp_t taggerdate,
int from_tag, int deref)
@ -148,19 +161,7 @@ static void name_rev(struct commit *start_commit,
continue;
if (parent_number > 1) {
size_t len;
strip_suffix(name->tip_name, "^0", &len);
if (name->generation > 0)
new_name = xstrfmt("%.*s~%d^%d",
(int)len,
name->tip_name,
name->generation,
parent_number);
else
new_name = xstrfmt("%.*s^%d", (int)len,
name->tip_name,
parent_number);
new_name = get_parent_name(name, parent_number);
generation = 0;
distance = name->distance + MERGE_TRAVERSAL_WEIGHT;
} else {