Skip to content

Commit aece3bc

Browse files
benknoblegitster
authored andcommitted
parseopt: fix :(optional) at command line to only ignore missing files
Unlike the configuration option magic, the parseopt code also ignores empty files: compare implementations from ccfcaf3 (parseopt: values of pathname type can be prefixed with :(optional), 2025-09-28) and 749d6d1 (config: values of pathname type can be prefixed with :(optional), 2025-09-28). Unify the 2 by not ignoring empty files, which is less surprising and the intended semantics from the first patch for config. Suggested-by: Phillip Wood <phillip.wood@dunelm.org.uk> Signed-off-by: D. Ben Knoble <ben.knoble+github@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent ccfcaf3 commit aece3bc

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

parse-options.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ static enum parse_opt_result do_get_value(struct parse_opt_ctx_t *p,
226226
if (!value)
227227
is_optional = 0;
228228
value = fix_filename(p->prefix, value);
229-
if (is_optional && is_empty_or_missing_file(value)) {
229+
if (is_optional && is_missing_file(value)) {
230230
free((char *)value);
231231
} else {
232232
FREE_AND_NULL(*(char **)opt->value);

0 commit comments

Comments
 (0)