ref-filter: simplify automatic color reset

peff · gitster · commit 51331aad69a1 · 2017-07-13T12:42:50.000-07:00
When the user-format doesn't add the closing color reset, we
add one automatically. But we do so by parsing the "reset"
string. We can just use the baked-in string literal, which
is simpler.

Signed-off-by: Jeff King &lt;peff@peff.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/ref-filter.c b/ref-filter.c
@@ -2084,11 +2084,7 @@ void format_ref_array_item(struct ref_array_item *info, const char *format,
 	}
 	if (need_color_reset_at_eol) {
 		struct atom_value resetv;
-		char color[COLOR_MAXLEN] = "";
-
-		if (color_parse("reset", color) < 0)
-			die("BUG: couldn't parse 'reset' as a color");
-		resetv.s = color;
+		resetv.s = GIT_COLOR_RESET;
 		append_atom(&resetv, &state);
 	}
 	if (state.stack->prev)

Original file line number	Diff line number	Diff line change
`@@ -2084,11 +2084,7 @@ void format_ref_array_item(struct ref_array_item info, const char format,`
`2084`	`2084`	`}`
`2085`	`2085`	`if (need_color_reset_at_eol) {`
`2086`	`2086`	`struct atom_value resetv;`
`2087`		`- char color[COLOR_MAXLEN] = "";`
`2088`		`-`
`2089`		`- if (color_parse("reset", color) < 0)`
`2090`		`- die("BUG: couldn't parse 'reset' as a color");`
`2091`		`- resetv.s = color;`
	`2087`	`+ resetv.s = GIT_COLOR_RESET;`
`2092`	`2088`	`append_atom(&resetv, &state);`
`2093`	`2089`	`}`
`2094`	`2090`	`if (state.stack->prev)`