kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

pretty: use strchr(3) in userformat_find_requirements() 

The strbuf_expand_step() loop in userformat_find_requirements() iterates
through the percent signs in the string "fmt", but we're not interested
in its effect on the strbuf "dummy".  Use strchr(3) instead and get rid
of the strbuf that we no longer need.

Suggested-by: Jeff King <peff@peff.net>
Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
René Scharfe 2023-07-07 21:08:33 +02:00 committed by Junio C Hamano
parent 4416b86c6b
commit bd19ee9c45
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pretty.c
View File

@ -1873,14 +1873,13 @@ static size_t format_commit_item(struct strbuf *sb, /* in UTF-8 */

void userformat_find_requirements(const char *fmt, struct userformat_want *w)
{
struct strbuf dummy = STRBUF_INIT;

if (!fmt) {
if (!user_format)
return;
fmt = user_format;
}
while (strbuf_expand_step(&dummy, &fmt)) {
while ((fmt = strchr(fmt, '%'))) {
fmt++;
if (skip_prefix(fmt, "%", &fmt))
continue;

@ -1900,7 +1899,6 @@ void userformat_find_requirements(const char *fmt, struct userformat_want *w)
break;
}
}
strbuf_release(&dummy);
}

void repo_format_commit_message(struct repository *r,