git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v2 1/1] grep: align default colors with GNU grep ones

From
Lénaïc Huard <lenaic@lhuard.fr>
Date
Jan 5, 2022, 08:18 UTC
Message-ID
<20220105081835.4949-2-lenaic@lhuard.fr>
In-Reply-To
<20220105081835.4949-1-lenaic@lhuard.fr>

git-grep shares a lot of options with the standard grep tool. Like GNU grep, it has coloring options to highlight the matching text. And like it, it has options to customize the various colored parts.

This patch updates the default git-grep colors to make them match the GNU grep default ones [1].

It was possible to get the same result by setting the various `color.grep.<slot>` options, but this patch makes `git grep --color` share the same color scheme as `grep --color` by default without any user configuration.

[1] https://www.man7.org/linux/man-pages/man1/grep.1.html#ENVIRONMENT
Signed-off-by: Lénaïc Huard <lenaic@lhuard.fr>
---
 grep.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/grep.c b/grep.c
index fe847a0111..ca4f321cb3 100644
--- a/grep.c
+++ b/grep.c
@@ -26,10 +26,10 @@ static struct grep_opt grep_defaults = {
 	.pattern_type_option = GREP_PATTERN_TYPE_UNSPECIFIED,
 	.colors = {
 		[GREP_COLOR_CONTEXT] = "",
-		[GREP_COLOR_FILENAME] = "",
+		[GREP_COLOR_FILENAME] = GIT_COLOR_MAGENTA,
 		[GREP_COLOR_FUNCTION] = "",
-		[GREP_COLOR_LINENO] = "",
-		[GREP_COLOR_COLUMNNO] = "",
+		[GREP_COLOR_LINENO] = GIT_COLOR_GREEN,
+		[GREP_COLOR_COLUMNNO] = GIT_COLOR_GREEN,
 		[GREP_COLOR_MATCH_CONTEXT] = GIT_COLOR_BOLD_RED,
 		[GREP_COLOR_MATCH_SELECTED] = GIT_COLOR_BOLD_RED,
 		[GREP_COLOR_SELECTED] = "",
-- 
2.34.1
Previous: Lénaïc Huard
Message 7 of 7 in “grep: align default colors with GNU grep ones”
  1. 0/1 grep: align default colors with GNU grep onesLénaïc Huard, Dec 16, 2021
  2. 1/1 grep: align default colors with GNU grep onesLénaïc Huard, Dec 16, 2021
  3. Junio C HamanoDec 16, 2021
  4. Junio C HamanoJan 3, 2022
  5. Lénaïc HuardJan 5, 2022
  6. 0/1 grep: align default colors with GNU grep onesLénaïc Huard, Jan 5, 2022
  7. 1/1 grep: align default colors with GNU grep onesLénaïc Huard, Jan 5, 2022

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.