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

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

[Antoine Pelisse]

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(-)

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

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

[Antoine Pelisse]

> 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,

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

[Junio C Hamano]

Antoine Pelisse <apelisse@gmail.com> writes:

>> 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.