зеркало из https://github.com/microsoft/git.git
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 in7e8f59d577
(grep: color patterns in output, 2009-03-07) it was non-NULL, but when that changed in15fabd1bbd
(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>
This commit is contained in:
Родитель
9725c8dda2
Коммит
b8db6ed826
|
@ -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")) {
|
||||
|
|
Загрузка…
Ссылка в новой задаче