diff: use skip_to_optional_arg_default() in parsing --relative
Helped-by: Jacob Keller <jacob.keller@gmail.com> Helped-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Dec 9, 2017 at 21:40 UTC
1efad51197f52ba9fb928b92a7f92514ab02a97f
1 file changed
+3
-4
diff.c
+3
-4
@@ -4563,11 +4563,10 @@ int diff_opt_parse(struct diff_options *options,
4563
options->flags.rename_empty = 1;
4564
else if (!strcmp(arg, "--no-rename-empty"))
4565
options->flags.rename_empty = 0;
4566
- else if (!strcmp(arg, "--relative"))
4566
+ else if (skip_to_optional_arg_default(arg, "--relative", &arg, NULL)) {
4567
options->flags.relative_name = 1;
4568
- else if (skip_prefix(arg, "--relative=", &arg)) {
4569
- options->flags.relative_name = 1;
4570
- options->prefix = arg;
4568
+ if (arg)
4569
+ options->prefix = arg;
4570
}
4571
4572
/* xdiff options */