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

diff-parseopt: convert -z

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:57 +07:00 committed by Junio C Hamano
parent 96860e48d3
commit 1a1eb164cf
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
diff.c
View File

@ -5238,6 +5238,9 @@ static void prep_parse_options(struct diff_options *options)
OPT_CALLBACK_F(0, "ws-error-highlight", options, N_("<kind>"), OPT_CALLBACK_F(0, "ws-error-highlight", options, N_("<kind>"),
N_("highlight whitespace errors in the 'context', 'old' or 'new' lines in the diff"), N_("highlight whitespace errors in the 'context', 'old' or 'new' lines in the diff"),
PARSE_OPT_NONEG, diff_opt_ws_error_highlight), PARSE_OPT_NONEG, diff_opt_ws_error_highlight),
OPT_SET_INT('z', NULL, &options->line_termination,
N_("do not munge pathnames and use NULs as output field terminators in --raw or --numstat"),
0),
OPT_CALLBACK_F(0, "output-indicator-new", OPT_CALLBACK_F(0, "output-indicator-new",
&options->output_indicators[OUTPUT_INDICATOR_NEW], &options->output_indicators[OUTPUT_INDICATOR_NEW],
N_("<char>"), N_("<char>"),
@ -5410,8 +5413,6 @@ int diff_opt_parse(struct diff_options *options,
} }
/* misc options */ /* misc options */
else if (!strcmp(arg, "-z"))
options->line_termination = 0;
else if ((argcount = short_opt('l', av, &optarg))) { else if ((argcount = short_opt('l', av, &optarg))) {
options->rename_limit = strtoul(optarg, NULL, 10); options->rename_limit = strtoul(optarg, NULL, 10);
return argcount; return argcount;