diff options
| author |  Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2022-02-16 01:00:35 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2022-02-15 18:00:50 -0800 |
| commit | b8db6ed8265fc44ebf7163a17600162f25df6de0 (patch) | |
| tree | 584b60976bc3988c502546c0cbbb0ed888ea6066 | |
| parent | built-ins: trust the "prefix" from run_builtin() (diff) | |
| download | tgif-b8db6ed8265fc44ebf7163a17600162f25df6de0.tar.xz | |
grep.c: don't pass along NULL callback value
Change grep_cmd_config() to stop passing around the always-NULL "cb"
value. When this code was added in 7e8f59d577e (grep: color patterns
in output, 2009-03-07) it was non-NULL, but when that changed in
15fabd1bbd4 (builtin/grep.c: make configuration callback more
reusable, 2012-10-09) this code was left behind.
In a subsequent change I'll start using the "cb" value, this will make
it clear which functions we call need it, and which don't.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/grep.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/grep.c b/builtin/grep.c index d85cbabea6..5ec4cecae4 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -285,8 +285,8 @@ static int wait_all(void) static int grep_cmd_config(const char *var, const char *value, void *cb) { - int st = grep_config(var, value, cb); - if (git_color_default_config(var, value, cb) < 0) + int st = grep_config(var, value, NULL); + if (git_color_default_config(var, value, NULL) < 0) st = -1; if (!strcmp(var, "grep.threads")) { |