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

diff-parseopt: convert --relative

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-02-21 18:16:19 +07:00 committed by Junio C Hamano
parent cdc43eb0b8
commit 0b1c5b59f0
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
diff.c
View File

@ -4960,6 +4960,18 @@ static enum parse_opt_result diff_opt_output(struct parse_opt_ctx_t *ctx,
return 0; return 0;
} }
static int diff_opt_relative(const struct option *opt,
const char *arg, int unset)
{
struct diff_options *options = opt->value;
BUG_ON_OPT_NEG(unset);
options->flags.relative_name = 1;
if (arg)
options->prefix = arg;
return 0;
}
static int diff_opt_unified(const struct option *opt, static int diff_opt_unified(const struct option *opt,
const char *arg, int unset) const char *arg, int unset)
{ {
@ -5094,6 +5106,10 @@ static void prep_parse_options(struct diff_options *options)
N_("use empty blobs as rename source")), N_("use empty blobs as rename source")),
OPT_GROUP(N_("Diff other options")), OPT_GROUP(N_("Diff other options")),
OPT_CALLBACK_F(0, "relative", options, N_("<prefix>"),
N_("when run from subdir, exclude changes outside and show relative paths"),
PARSE_OPT_NONEG | PARSE_OPT_OPTARG,
diff_opt_relative),
{ OPTION_CALLBACK, 0, "output", options, N_("<file>"), { OPTION_CALLBACK, 0, "output", options, N_("<file>"),
N_("Output to a specific file"), N_("Output to a specific file"),
PARSE_OPT_NONEG, NULL, 0, diff_opt_output }, PARSE_OPT_NONEG, NULL, 0, diff_opt_output },
@ -5125,15 +5141,8 @@ int diff_opt_parse(struct diff_options *options,
if (ac) if (ac)
return ac; return ac;
/* renames options */
if (skip_to_optional_arg_default(arg, "--relative", &arg, NULL)) {
options->flags.relative_name = 1;
if (arg)
options->prefix = arg;
}
/* xdiff options */ /* xdiff options */
else if (!strcmp(arg, "--minimal")) if (!strcmp(arg, "--minimal"))
DIFF_XDL_SET(options, NEED_MINIMAL); DIFF_XDL_SET(options, NEED_MINIMAL);
else if (!strcmp(arg, "--no-minimal")) else if (!strcmp(arg, "--no-minimal"))
DIFF_XDL_CLR(options, NEED_MINIMAL); DIFF_XDL_CLR(options, NEED_MINIMAL);