[PATCH 6/6] log --grep: honor grep.patterntype etc. configuration variables
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Oct 4, 2012, 01:33 UTC
- Message-ID
- <1349314419-8397-7-git-send-email-gitster@pobox.com>
- In-Reply-To
- <1349314419-8397-1-git-send-email-gitster@pobox.com>
Read grep.extendedregexp, grep.patterntype, etc. from the configuration so that "log --grep='<pcre>'" honors the user preference without an explicit -P from the command line.
Now that the callback parameter, which was so far unused, to git_log_config() has to be of type "struct rev_info *", stop passing it down to git_diff_ui_config(). The latter does not currently take any callback parameter, and when it does, we would need to make a structure that has rev info and that parameter and pass it to git_log_config() anyway, and until that happens, passing NULL will be less error prone.
Signed-off-by: Junio C Hamano <gitster@pobox.com> --- builtin/log.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/builtin/log.c b/builtin/log.c index 07a0078..a38a6dd 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -329,6 +329,8 @@ static int cmd_log_walk(struct rev_info *rev) static int git_log_config(const char *var, const char *value, void *cb) { + struct rev_info *revs = cb; + if (!strcmp(var, "format.pretty")) return git_config_string(&fmt_pretty, var, value); if (!strcmp(var, "format.subjectprefix")) @@ -352,7 +354,8 @@ static int git_log_config(const char *var, const char *value, void *cb) if (!prefixcmp(var, "color.decorate.")) return parse_decorate_color_config(var, 15, value); - return git_diff_ui_config(var, value, cb); + grep_config(var, value, &revs->grep_filter); + return git_diff_ui_config(var, value, NULL); } int cmd_whatchanged(int argc, const char **argv, const char *prefix)
-- 1.8.0.rc0.57.g712528f