git/parse-options.c, branch main

Merge branch 'rs/parse-options-duplicated-long-options'

2026-03-10T21:23:19Z

The parse-options API learned to notice an options[] array with duplicated long options. * rs/parse-options-duplicated-long-options: parseopt: check for duplicate long names and numerical options pack-objects: remove duplicate --stdin-packs definition

parseopt: check for duplicate long names and numerical options

2026-03-02T15:39:01Z

We already check for duplicate short names. Check for and report duplicate long names and numerical options as well. Perform the slightly expensive string duplicate check only when showing the usage to keep the cost of normal invocations low. t0012-help.sh covers it. Helped-by: Jeff King Signed-off-by: René Scharfe Signed-off-by: Junio C Hamano

Merge branch 'dk/parseopt-optional-filename-fixes'

2025-11-06T23:17:01Z

A recently added configuration variable and command line option syntax ":(optional)" for values that are of filename type inconsistently behaved on an empty file (configuration took it happily, while the command line option pretended as if it did not exist), which has been corrected. * dk/parseopt-optional-filename-fixes: parseopt: remove unreachable code parseopt: restore const qualifier to parsed filename config: use boolean type for a simple flag parseopt: use boolean type for a simple flag doc: clarify command equivalence comment parseopt: fix :(optional) at command line to only ignore missing files

parseopt: remove unreachable code

2025-11-04T17:36:10Z

At this point in the code after running skip_prefix() on the variable and receiving the result in the same variable, the contents of the variable can never be NULL. The function either (1) updates the variable to point at a later part of the string it originally pointed at, or (2) leaves it intact if the string does not have the prefix. (1) will never make the variable NULL, and (2) cannot be the source of NULL, because the variable cannot be NULL before calling skip_prefix(), which would die immediately by dereferencing the NULL pointer in that case. Helped-by: Phillip Wood Signed-off-by: Junio C Hamano

parseopt: restore const qualifier to parsed filename

2025-11-04T17:25:52Z

This was unintentionally dropped in ccfcaf399f (parseopt: values of pathname type can be prefixed with :(optional), 2025-09-28). Notably, continue dropping the const qualifier when free'ing value; see 4049b9cfc0 (fix const issues with some functions, 2007-10-16) or 83838d5c1b (cast variable in call to free() in builtin/diff.c and submodule.c, 2011-11-06) for more details on why. Suggested-by: Phillip Wood Signed-off-by: D. Ben Knoble Signed-off-by: Junio C Hamano

parseopt: use boolean type for a simple flag

2025-11-04T17:25:51Z

Suggested-by: Phillip Wood Signed-off-by: D. Ben Knoble Signed-off-by: Junio C Hamano

parseopt: fix :(optional) at command line to only ignore missing files

2025-11-04T17:25:51Z

Unlike the configuration option magic, the parseopt code also ignores empty files: compare implementations from ccfcaf399f (parseopt: values of pathname type can be prefixed with :(optional), 2025-09-28) and 749d6d166d (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 Signed-off-by: D. Ben Knoble Signed-off-by: Junio C Hamano

Merge branch 'jc/optional-path'

2025-10-14T19:56:09Z

Configuration variables that take a pathname as a value (e.g. blame.ignorerevsfile) can be marked as optional by prefixing ":(optoinal)" before its value. * jc/optional-path: parseopt: values of pathname type can be prefixed with :(optional) config: values of pathname type can be prefixed with :(optional) t7500: fix GIT_EDITOR shell snippet t7500: make each piece more independent

parseopt: values of pathname type can be prefixed with :(optional)

2025-10-07T17:05:48Z

In the previous step, we introduced an optional filename that can be given to a configuration variable, and nullify the fact that such a configuration setting even existed if the named path is missing or empty. Let's do the same for command line options that name a pathname. Signed-off-by: Junio C Hamano Signed-off-by: Taylor Blau Signed-off-by: D. Ben Knoble Signed-off-by: Junio C Hamano

Merge branch 'dk/help-all'

2025-08-25T21:22:00Z

"git cmd --help-all" now works outside repositories. * dk/help-all: builtin: also setup gently for --help-all parse-options: refactor flags for usage_with_options_internal