Merge branch 'rs/userformat-find-requirements-simplify'

gitster · gitster · commit d383b4f24e29 · 2023-07-17T11:30:41.000-07:00
Code simplification.

* rs/userformat-find-requirements-simplify:
  pretty: use strchr(3) in userformat_find_requirements()
diff --git a/pretty.c b/pretty.c
@@ -1876,14 +1876,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;
 
@@ -1903,7 +1902,6 @@ void userformat_find_requirements(const char *fmt, struct userformat_want *w)
 			break;
 		}
 	}
-	strbuf_release(&dummy);
 }
 
 void repo_format_commit_message(struct repository *r,

Original file line number	Diff line number	Diff line change
`@@ -1876,14 +1876,13 @@ static size_t format_commit_item(struct strbuf sb, / in UTF-8 */`
`1876`	`1876`
`1877`	`1877`	`void userformat_find_requirements(const char fmt, struct userformat_want w)`
`1878`	`1878`	`{`
`1879`		`- struct strbuf dummy = STRBUF_INIT;`
`1880`		`-`
`1881`	`1879`	`if (!fmt) {`
`1882`	`1880`	`if (!user_format)`
`1883`	`1881`	`return;`
`1884`	`1882`	`fmt = user_format;`
`1885`	`1883`	`}`
`1886`		`- while (strbuf_expand_step(&dummy, &fmt)) {`
	`1884`	`+ while ((fmt = strchr(fmt, '%'))) {`
	`1885`	`+ fmt++;`
`1887`	`1886`	`if (skip_prefix(fmt, "%", &fmt))`
`1888`	`1887`	`continue;`
`1889`	`1888`
`@@ -1903,7 +1902,6 @@ void userformat_find_requirements(const char fmt, struct userformat_want w)`
`1903`	`1902`	`break;`
`1904`	`1903`	`}`
`1905`	`1904`	`}`
`1906`		`- strbuf_release(&dummy);`
`1907`	`1905`	`}`
`1908`	`1906`
`1909`	`1907`	`void repo_format_commit_message(struct repository *r,`