Subject: Re: [PATCH v11 07/13] ls-tree: fix "--name-only" and "--long" combined use bug

From: Ævar Arnfjörð Bjarmason <[email-masked]>
Date: Sat, 19 Feb 2022 07:04:39 +0100

On Tue, Feb 08 2022, Teng Long wrote:

> If we execute "git ls-tree" with combined "--name-only" and "--long"
> , only the pathname will be printed, the size is omitted (the original
> discoverer was Peff in [1]).
>
> This commit fix this issue by using `OPT_CMDMODE()` instead to make both
> of them mutually exclusive.
>
> [1] https://public-inbox.org/git/[email-masked]/
>
> Signed-off-by: Teng Long <[email-masked]>
> ---
>  builtin/ls-tree.c | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/builtin/ls-tree.c b/builtin/ls-tree.c
> index 9c57a36c8c..32147e75e6 100644
> --- a/builtin/ls-tree.c
> +++ b/builtin/ls-tree.c
> @@ -120,12 +120,12 @@ int cmd_ls_tree(int argc, const char **argv, const char *prefix)
>  			LS_SHOW_TREES),
>  		OPT_SET_INT('z', NULL, &line_termination,
>  			    N_("terminate entries with NUL byte"), 0),
> -		OPT_BIT('l', "long", &ls_options, N_("include object size"),
> -			LS_SHOW_SIZE),
> -		OPT_BIT(0, "name-only", &ls_options, N_("list only filenames"),
> -			LS_NAME_ONLY),
> -		OPT_BIT(0, "name-status", &ls_options, N_("list only filenames"),
> -			LS_NAME_ONLY),
> +		OPT_CMDMODE('l', "long", &ls_options, N_("include object size"),
> +			    LS_SHOW_SIZE),
> +		OPT_CMDMODE(0, "name-only", &ls_options, N_("list only filenames"),
> +			    LS_NAME_ONLY),
> +		OPT_CMDMODE(0, "name-status", &ls_options, N_("list only filenames"),
> +			    LS_NAME_ONLY),
>  		OPT_SET_INT(0, "full-name", &chomp_prefix,
>  			    N_("use full path names"), 0),
>  		OPT_BOOL(0, "full-tree", &full_tree,

This seems like a sensible fix, but let's add a test for it. See:

    git grep 'test_expect_code 129'

For examples.