threads / patch / 32988

patchupdate-index: allow "-h" to also display options

Subject: [PATCH] update-index: allow "-h" to also display options

## tl;dr

3 messages between Feb 23, 2013 and Feb 23, 2013. Diffs are folded; open one to read it.

replies: 2people: 2as markdown or json

Antoine Pelisse· Feb 23, 2013, 18:10 UTC · lore

Currently, when running "git update-index -h", you only have usage displayed, but no options. That is not consistent with the behavior of other commands. It also means that the only way to display options is to use an unknown argument (or use the man page).

Display usage with options when "git update-index -h" is invoked.

Signed-off-by: Antoine Pelisse <apelisse@gmail.com>
---
 builtin/update-index.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Show changes to builtin/update-index.c +1 −1

diff --git a/builtin/update-index.c b/builtin/update-index.c
index ada1dff..3071ee6 100644
--- a/builtin/update-index.c
+++ b/builtin/update-index.c
@@ -796,7 +796,7 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
 	};
 
 	if (argc == 2 && !strcmp(argv[1], "-h"))
-		usage(update_index_usage[0]);
+		usage_with_options(&update_index_usage[0], options);
 
 	git_config(git_default_config, NULL);

-- 
1.7.9.5

Antoine Pelisse· Feb 23, 2013, 18:13 UTC · re: Antoine Pelisse · lore

Re: [PATCH] update-index: allow "-h" to also display options

Show 13 quoted lines

> diff --git a/builtin/update-index.c b/builtin/update-index.c
> index ada1dff..3071ee6 100644
> --- a/builtin/update-index.c
> +++ b/builtin/update-index.c
> @@ -796,7 +796,7 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
>         };
>
>         if (argc == 2 && !strcmp(argv[1], "-h"))
> -               usage(update_index_usage[0]);
> +               usage_with_options(&update_index_usage[0], options);
>
>         git_config(git_default_config, NULL);
>

Ok I just realized that

    usage_with_options(update_index_usage, options);

would be better...

Antoine,

Junio C Hamano· Feb 23, 2013, 21:25 UTC · re: Antoine Pelisse · lore

Re: [PATCH] update-index: allow "-h" to also display options

Antoine Pelisse <apelisse@gmail.com> writes:

Show 19 quoted lines

>> diff --git a/builtin/update-index.c b/builtin/update-index.c
>> index ada1dff..3071ee6 100644
>> --- a/builtin/update-index.c
>> +++ b/builtin/update-index.c
>> @@ -796,7 +796,7 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
>>         };
>>
>>         if (argc == 2 && !strcmp(argv[1], "-h"))
>> -               usage(update_index_usage[0]);
>> +               usage_with_options(&update_index_usage[0], options);
>>
>>         git_config(git_default_config, NULL);
>>
>
> Ok I just realized that
>
>     usage_with_options(update_index_usage, options);
>
> would be better...

Yeah, that probably is easier on the eyes, even though they are equivalent.

Thanks, will queue.