Merge branch 'maint'

diff --git a/builtin-grep.c b/builtin-grep.c
index 552ef1face1e25c11d5f114c8d5c1265c6c3ae9b..40b9a93127482bebf6dc8c9eb39b2104711a543a 100644 (file)
--- a/builtin-grep.c
+++ b/builtin-grep.c
@@ -811,7 +811,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
                        "print NUL after filenames"),
                OPT_BOOLEAN('c', "count", &opt.count,
                        "show the number of matches instead of matching lines"),
-               OPT_SET_INT(0, "color", &opt.color, "highlight matches", 1),
+               OPT__COLOR(&opt.color, "highlight matches"),
                OPT_GROUP(""),
                OPT_CALLBACK('C', NULL, &opt, "n",
                        "show <n> context lines before and after matches",
@@ -868,6 +868,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
        opt.relative = 1;
        opt.pathname = 1;
        opt.pattern_tail = &opt.pattern_list;
+       opt.header_tail = &opt.header_list;
        opt.regflags = REG_NEWLINE;
        opt.max_depth = -1;