Merge branch 'ps/grep-help-all-callback-arg'

Code clean-up. * ps/grep-help-all-callback-arg: grep: correctly initialize help-all option
git-mirror · Apr 20, 2015 · 7ff1402 · 7ff1402
2 parents 9718c7c + 5dcd1b1
commit 7ff1402
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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()
 	};