undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

diff-parseopt: convert -l

Browse Source 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy 2019-03-24 15:19:58 +07:00 committed by Junio C Hamano
parent 1a1eb164cf
commit bffee749a8
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
diff.c
View File

@ -5283,6 +5283,8 @@ static void prep_parse_options(struct diff_options *options)
OPT_CALLBACK_F(0, "follow", options, NULL, OPT_CALLBACK_F(0, "follow", options, NULL,
N_("continue listing the history of a file beyond renames"), N_("continue listing the history of a file beyond renames"),
PARSE_OPT_NOARG, diff_opt_follow), PARSE_OPT_NOARG, diff_opt_follow),
OPT_INTEGER('l', NULL, &options->rename_limit,
N_("prevent rename/copy detection if the number of rename/copy targets exceeds given limit")),
OPT_GROUP(N_("Diff algorithm options")), OPT_GROUP(N_("Diff algorithm options")),
OPT_BIT(0, "minimal", &options->xdl_opts, OPT_BIT(0, "minimal", &options->xdl_opts,
@ -5413,10 +5415,6 @@ int diff_opt_parse(struct diff_options *options,
} }
/* misc options */ /* misc options */
else if ((argcount = short_opt('l', av, &optarg))) {
options->rename_limit = strtoul(optarg, NULL, 10);
return argcount;
}
else if ((argcount = short_opt('S', av, &optarg))) { else if ((argcount = short_opt('S', av, &optarg))) {
options->pickaxe = optarg; options->pickaxe = optarg;
options->pickaxe_opts |= DIFF_PICKAXE_KIND_S; options->pickaxe_opts |= DIFF_PICKAXE_KIND_S;