зеркало из https://github.com/microsoft/git.git
pretty: single return path in %(trailers) handling
No functional change intended. This change may not seem useful on its own, but upcoming commits will do memory allocation in there, and a single return path makes deallocation easier. Signed-off-by: Anders Waldenborg <anders@0x63.nu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
4f732e0fd7
Коммит
3e3f347819
4
pretty.c
4
pretty.c
|
@ -1353,6 +1353,7 @@ static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */
|
||||||
|
|
||||||
if (skip_prefix(placeholder, "(trailers", &arg)) {
|
if (skip_prefix(placeholder, "(trailers", &arg)) {
|
||||||
struct process_trailer_options opts = PROCESS_TRAILER_OPTIONS_INIT;
|
struct process_trailer_options opts = PROCESS_TRAILER_OPTIONS_INIT;
|
||||||
|
size_t ret = 0;
|
||||||
|
|
||||||
opts.no_divider = 1;
|
opts.no_divider = 1;
|
||||||
|
|
||||||
|
@ -1366,8 +1367,9 @@ static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */
|
||||||
}
|
}
|
||||||
if (*arg == ')') {
|
if (*arg == ')') {
|
||||||
format_trailers_from_commit(sb, msg + c->subject_off, &opts);
|
format_trailers_from_commit(sb, msg + c->subject_off, &opts);
|
||||||
return arg - placeholder + 1;
|
ret = arg - placeholder + 1;
|
||||||
}
|
}
|
||||||
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0; /* unknown placeholder */
|
return 0; /* unknown placeholder */
|
||||||
|
|
Загрузка…
Ссылка в новой задаче