diff --git a/builtin-grep.c b/builtin-grep.c
index 037452ec79475244f4cae7cfc936695e1de58a63..9343cc5e5dc66e6e47b15d49de71df39a24050bf 100644 (file)
--- a/builtin-grep.c
+++ b/builtin-grep.c
#include "tree-walk.h"
#include "builtin.h"
#include "parse-options.h"
+#include "userdiff.h"
#include "grep.h"
#ifndef NO_EXTERNAL_GREP
{
struct grep_opt *opt = cb;
+ switch (userdiff_config(var, value)) {
+ case 0: break;
+ case -1: return -1;
+ default: return 0;
+ }
+
if (!strcmp(var, "color.grep")) {
opt->color = git_config_colorbool(var, value, -1);
return 0;