Skip to content

Commit 1efad51

Browse files
committed
diff: use skip_to_optional_arg_default() in parsing --relative
Helped-by: Jacob Keller <[email protected]> Helped-by: Jeff King <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent cf81f94 commit 1efad51

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

diff.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4563,11 +4563,10 @@ int diff_opt_parse(struct diff_options *options,
45634563
options->flags.rename_empty = 1;
45644564
else if (!strcmp(arg, "--no-rename-empty"))
45654565
options->flags.rename_empty = 0;
4566-
else if (!strcmp(arg, "--relative"))
4566+
else if (skip_to_optional_arg_default(arg, "--relative", &arg, NULL)) {
45674567
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;
45714570
}
45724571

45734572
/* xdiff options */

0 commit comments

Comments
 (0)