diff-parseopt: convert --pickaxe-all|--pickaxe-regex
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Nguyễn Thái Ngọc Duy committed
Mar 24, 2019 at 15:20 UTC
85f8e889ea3b1eeb0d183c6db8c4a407a8133350
1 file changed
+6
-4
diff.c
+6
-4
@@ -5391,6 +5391,12 @@ static void prep_parse_options(struct diff_options *options)
5391
OPT_CALLBACK_F('G', NULL, options, N_("<regex>"),
5392
N_("look for differences that change the number of occurrences of the specified regex"),
5393
0, diff_opt_pickaxe_regex),
5394
+ OPT_BIT_F(0, "pickaxe-all", &options->pickaxe_opts,
5395
+ N_("show all changes in the changeset with -S or -G"),
5396
+ DIFF_PICKAXE_ALL, PARSE_OPT_NONEG),
5397
+ OPT_BIT_F(0, "pickaxe-regex", &options->pickaxe_opts,
5398
+ N_("treat <string> in -S as extended POSIX regular expression"),
5399
+ DIFF_PICKAXE_REGEX, PARSE_OPT_NONEG),
5400
{ OPTION_CALLBACK, 0, "output", options, N_("<file>"),
5401
N_("Output to a specific file"),
5402
PARSE_OPT_NONEG, NULL, 0, diff_opt_output },
@@ -5443,10 +5449,6 @@ int diff_opt_parse(struct diff_options *options,
5449
}
5450
5451
/* misc options */
5446
- else if (!strcmp(arg, "--pickaxe-all"))
5447
- options->pickaxe_opts |= DIFF_PICKAXE_ALL;
5448
- else if (!strcmp(arg, "--pickaxe-regex"))
5449
- options->pickaxe_opts |= DIFF_PICKAXE_REGEX;
5452
else if ((argcount = short_opt('O', av, &optarg))) {
5453
options->orderfile = prefix_filename(prefix, optarg);
5454
return argcount;