From: Simon Ser <contact@emersion.fr>
To: git@vger.kernel.org
Cc: gitster@pobox.com, me@ttaylorr.com
Subject: [PATCH] grep: add configuration variables for --heading
Date: Tue, 26 May 2020 08:37:23 +0000 [thread overview]
Message-ID: <4WK2xPaKLXPbLE0jjY0rBR9M_BVt69rzJKBN17M0ily4VPYuMNC_a2kXsIKWR8y6lc7j58WpBmaIqdbJ1whnjonrfEWz7YE-WpdQqCu_lN0=@emersion.fr> (raw)
There are already configuration variables for -n and --column. Add one
for --heading, allowing users to customize the default behaviour.
Signed-off-by: Simon Ser <contact@emersion.fr>
---
Documentation/git-grep.txt | 3 +++
grep.c | 5 +++++
2 files changed, 8 insertions(+)
diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt
index a7f9bc99eaf1..ed4f05d885a2 100644
--- a/Documentation/git-grep.txt
+++ b/Documentation/git-grep.txt
@@ -47,6 +47,9 @@ grep.lineNumber::
grep.column::
If set to true, enable the `--column` option by default.
+grep.heading::
+ If set to true, enable the `--heading` option by default.
+
grep.patternType::
Set the default matching behavior. Using a value of 'basic', 'extended',
'fixed', or 'perl' will enable the `--basic-regexp`, `--extended-regexp`,
diff --git a/grep.c b/grep.c
index 13232a904aca..4549bc722650 100644
--- a/grep.c
+++ b/grep.c
@@ -133,6 +133,10 @@ int grep_config(const char *var, const char *value, void *cb)
opt->columnnum = git_config_bool(var, value);
return 0;
}
+ if (!strcmp(var, "grep.heading")) {
+ opt->heading = git_config_bool(var, value);
+ return 0;
+ }
if (!strcmp(var, "grep.fullname")) {
opt->relative = !git_config_bool(var, value);
@@ -199,6 +203,7 @@ void grep_init(struct grep_opt *opt, struct repository *repo, const char *prefix
opt->pattern_type_option = def->pattern_type_option;
opt->linenum = def->linenum;
opt->columnnum = def->columnnum;
+ opt->heading = def->heading;
opt->max_depth = def->max_depth;
opt->pathname = def->pathname;
opt->relative = def->relative;
--
2.26.2
next reply other threads:[~2020-05-26 8:37 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-26 8:37 Simon Ser [this message]
2020-05-26 13:40 ` [PATCH] grep: add configuration variables for --heading Eric Sunshine
2020-05-27 15:45 ` [PATCH v2] " Simon Ser
2020-05-27 16:45 ` Junio C Hamano
2020-06-08 10:22 ` Simon Ser
2020-06-08 14:02 ` Phillip Wood
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='4WK2xPaKLXPbLE0jjY0rBR9M_BVt69rzJKBN17M0ily4VPYuMNC_a2kXsIKWR8y6lc7j58WpBmaIqdbJ1whnjonrfEWz7YE-WpdQqCu_lN0=@emersion.fr' \
--to=contact@emersion.fr \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=me@ttaylorr.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).