summaryrefslogtreecommitdiff
path: root/builtin/grep.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-04-20 22:28:34 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-04-20 22:28:34 (GMT)
commit7ff140202a2f55b6856f658711e2b99d293c1fd9 (patch)
tree84e274b0610d71f34403f4898ea1a323a819c44d /builtin/grep.c
parent9718c7c0c2a92585729d0f2e05ebf2c44b0cc56a (diff)
parent5dcd1b157790232bf0b2c03ed083c8a2ff670663 (diff)
downloadgit-7ff140202a2f55b6856f658711e2b99d293c1fd9.zip
git-7ff140202a2f55b6856f658711e2b99d293c1fd9.tar.gz
git-7ff140202a2f55b6856f658711e2b99d293c1fd9.tar.bz2
Merge branch 'ps/grep-help-all-callback-arg'
Code clean-up. * ps/grep-help-all-callback-arg: grep: correctly initialize help-all option
Diffstat (limited to 'builtin/grep.c')
-rw-r--r--builtin/grep.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/grep.c b/builtin/grep.c
index abc4400..d04f440 100644
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -738,7 +738,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
PARSE_OPT_OPTARG, NULL, (intptr_t)default_pager },
OPT_BOOL(0, "ext-grep", &external_grep_allowed__ignored,
N_("allow calling of grep(1) (ignored by this build)")),
- { OPTION_CALLBACK, 0, "help-all", &options, NULL, N_("show usage"),
+ { OPTION_CALLBACK, 0, "help-all", NULL, NULL, N_("show usage"),
PARSE_OPT_HIDDEN | PARSE_OPT_NOARG, help_callback },
OPT_END()
};