Re: [PATCH] usage_with_options: omit double new line on empty option list
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Aug 25, 2017, 17:21 UTC
- Message-ID
- <xmqq378ftvfs.fsf@gitster.mtv.corp.google.com>
- In-Reply-To
- <xmqq7exrtvl1.fsf@gitster.mtv.corp.google.com>
Junio C Hamano <gitster@pobox.com> writes:
Show 22 quoted lines
> Stefan Beller <sbeller@google.com> writes: > >> Currently the worktree command gives its usage, when no subcommand is >> given. However there are no general options, all options are related to >> the subcommands itself, such that: >> >> $ git worktree >> usage: git worktree add [<options>] <path> [<branch>] >> or: git worktree list [<options>] >> or: git worktree lock [<options>] <path> >> or: git worktree prune [<options>] >> or: git worktree unlock <path> >> >> >> $ >> >> Note the two empty lines at the end of the usage string. This is because >> the toplevel usage is printed with an empty options list. >> >> Only print one new line after the usage string if the option list is empty. > > Good find. Shouldn't the last word in the sentence "non-empty", though?
Ah, the "do this" part was hard to understand and I misread it. I thought you were saying "only give a blank if we have something that need to be separated from the stuff above".
So what you wrote above is not incorrect per-se, but I think it is prone to be misunderstood.
Show 20 quoted lines
>
>>
>> Signed-off-by: Stefan Beller <sbeller@google.com>
>> ---
>> parse-options.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/parse-options.c b/parse-options.c
>> index 0dd9fc6a0d..1307c82861 100644
>> --- a/parse-options.c
>> +++ b/parse-options.c
>> @@ -603,7 +603,7 @@ static int usage_with_options_internal(struct parse_opt_ctx_t *ctx,
>> usagestr++;
>> }
>>
>> - if (opts->type != OPTION_GROUP)
>> + if (opts->type != OPTION_GROUP && opts->type != OPTION_END)
>> fputc('\n', outfile);
>>
>> for (; opts->type != OPTION_END; opts++) {