[PATCH 1/2] remote: Remove -v/--verbose option from git remote show synopsis

[PATCH 1/2] remote: Remove -v/--verbose option from git remote show synopsis

[Alexander Kuleshov]

git remote show doesn't use -v/--verbose option

Signed-off-by: Alexander Kuleshov <kuleshovmail@gmail.com>
---
 builtin/remote.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/builtin/remote.c b/builtin/remote.c
index 46ecfd9..978c645 100644
--- a/builtin/remote.c
+++ b/builtin/remote.c
@@ -14,7 +14,7 @@ static const char * const builtin_remote_usage[] = {
 	N_("git remote rename <old> <new>"),
 	N_("git remote remove <name>"),
 	N_("git remote set-head <name> (-a | --auto | -d | --delete |<branch>)"),
-	N_("git remote [-v | --verbose] show [-n] <name>"),
+	N_("git remote show [-n] <name>"),
 	N_("git remote prune [-n | --dry-run] <name>"),
 	N_("git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"),
 	N_("git remote set-branches [--add] <name> <branch>..."),
-- 
2.2.1.364.g47473d1.dirty

Re: [PATCH 1/2] remote: Remove -v/--verbose option from git remote show synopsis

[René Scharfe]

Am 08.01.2015 um 18:57 schrieb Alexander Kuleshov:
> git remote show doesn't use -v/--verbose option

Hmm, but it does?

	$ git version
	git version 2.2.1
	$ git remote show
	origin
	$ git remote -v show
	origin  git://git.kernel.org/pub/scm/git/git.git (fetch)
	origin  git://git.kernel.org/pub/scm/git/git.git (push)

Perhaps you meant the following variant?  The changed line documents the 
one above, though (-v before show).

	$ git remote show -v
	error: unknown switch `v'
	usage: git remote show [<options>] <name>

	    -n                    do not query remotes

> Signed-off-by: Alexander Kuleshov <kuleshovmail@gmail.com>
> ---
>   builtin/remote.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/builtin/remote.c b/builtin/remote.c
> index 46ecfd9..978c645 100644
> --- a/builtin/remote.c
> +++ b/builtin/remote.c
> @@ -14,7 +14,7 @@ static const char * const builtin_remote_usage[] = {
>   	N_("git remote rename <old> <new>"),
>   	N_("git remote remove <name>"),
>   	N_("git remote set-head <name> (-a | --auto | -d | --delete |<branch>)"),
> -	N_("git remote [-v | --verbose] show [-n] <name>"),
> +	N_("git remote show [-n] <name>"),
>   	N_("git remote prune [-n | --dry-run] <name>"),
>   	N_("git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"),
>   	N_("git remote set-branches [--add] <name> <branch>..."),
>

Re: [PATCH 1/2] remote: Remove -v/--verbose option from git remote show synopsis

[Alexander Kuleshov]

Ah, yes, right. Please dismiss 1,2 patches.

Sorry for noise

2015-01-09 1:17 GMT+06:00 René Scharfe <l.s.r@web.de>:
> Am 08.01.2015 um 18:57 schrieb Alexander Kuleshov:
>>
>> git remote show doesn't use -v/--verbose option
>
>
> Hmm, but it does?
>
>         $ git version
>         git version 2.2.1
>         $ git remote show
>         origin
>         $ git remote -v show
>         origin  git://git.kernel.org/pub/scm/git/git.git (fetch)
>         origin  git://git.kernel.org/pub/scm/git/git.git (push)
>
> Perhaps you meant the following variant?  The changed line documents the one
> above, though (-v before show).
>
>         $ git remote show -v
>         error: unknown switch `v'
>         usage: git remote show [<options>] <name>
>
>             -n                    do not query remotes
>
>
>> Signed-off-by: Alexander Kuleshov <kuleshovmail@gmail.com>
>> ---
>>   builtin/remote.c | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/builtin/remote.c b/builtin/remote.c
>> index 46ecfd9..978c645 100644
>> --- a/builtin/remote.c
>> +++ b/builtin/remote.c
>> @@ -14,7 +14,7 @@ static const char * const builtin_remote_usage[] = {
>>         N_("git remote rename <old> <new>"),
>>         N_("git remote remove <name>"),
>>         N_("git remote set-head <name> (-a | --auto | -d | --delete
>> |<branch>)"),
>> -       N_("git remote [-v | --verbose] show [-n] <name>"),
>> +       N_("git remote show [-n] <name>"),
>>         N_("git remote prune [-n | --dry-run] <name>"),
>>         N_("git remote [-v | --verbose] update [-p | --prune] [(<group> |
>> <remote>)...]"),
>>         N_("git remote set-branches [--add] <name> <branch>..."),
>>
>



-- 
_________________________
0xAX

Re: [PATCH 1/2] remote: Remove -v/--verbose option from git remote show synopsis

[Junio C Hamano]

René Scharfe <l.s.r@web.de> writes:

> Am 08.01.2015 um 18:57 schrieb Alexander Kuleshov:
>> git remote show doesn't use -v/--verbose option
>
> Hmm, but it does?
>
> 	$ git version
> 	git version 2.2.1
> 	$ git remote show
> 	origin
> 	$ git remote -v show
> 	origin  git://git.kernel.org/pub/scm/git/git.git (fetch)
> 	origin  git://git.kernel.org/pub/scm/git/git.git (push)
>
> Perhaps you meant the following variant?  The changed line documents
> the one above, though (-v before show).
>
> 	$ git remote show -v
> 	error: unknown switch `v'
> 	usage: git remote show [<options>] <name>
>
> 	    -n                    do not query remotes

Ahh, I misread the patch.  Thanks.

>> diff --git a/builtin/remote.c b/builtin/remote.c
>> index 46ecfd9..978c645 100644
>> --- a/builtin/remote.c
>> +++ b/builtin/remote.c
>> @@ -14,7 +14,7 @@ static const char * const builtin_remote_usage[] = {
>>   	N_("git remote rename <old> <new>"),
>>   	N_("git remote remove <name>"),
>>   	N_("git remote set-head <name> (-a | --auto | -d | --delete |<branch>)"),
>> -	N_("git remote [-v | --verbose] show [-n] <name>"),
>> +	N_("git remote show [-n] <name>"),
>>   	N_("git remote prune [-n | --dry-run] <name>"),
>>   	N_("git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"),
>>   	N_("git remote set-branches [--add] <name> <branch>..."),
>>

I however have a bit larger question.  Does it make sense to have
[-v/--verbose] in front of some but not all of the subcommands?

For example, the above snippet gives me an impression that

    $ git remote -v prune -n origin

should not work, but that does not seem to be the case.

Re: [PATCH 1/2] remote: Remove -v/--verbose option from git remote show synopsis

[Alexander Kuleshov]

What if move -v/--verbose after commands? Like:

git remote show [-v | --verbose] [-n] <name>

and etc...?

2015-01-09 2:14 GMT+06:00 Junio C Hamano <gitster@pobox.com>:
> René Scharfe <l.s.r@web.de> writes:
>
>> Am 08.01.2015 um 18:57 schrieb Alexander Kuleshov:
>>> git remote show doesn't use -v/--verbose option
>>
>> Hmm, but it does?
>>
>>       $ git version
>>       git version 2.2.1
>>       $ git remote show
>>       origin
>>       $ git remote -v show
>>       origin  git://git.kernel.org/pub/scm/git/git.git (fetch)
>>       origin  git://git.kernel.org/pub/scm/git/git.git (push)
>>
>> Perhaps you meant the following variant?  The changed line documents
>> the one above, though (-v before show).
>>
>>       $ git remote show -v
>>       error: unknown switch `v'
>>       usage: git remote show [<options>] <name>
>>
>>           -n                    do not query remotes
>
> Ahh, I misread the patch.  Thanks.
>
>>> diff --git a/builtin/remote.c b/builtin/remote.c
>>> index 46ecfd9..978c645 100644
>>> --- a/builtin/remote.c
>>> +++ b/builtin/remote.c
>>> @@ -14,7 +14,7 @@ static const char * const builtin_remote_usage[] = {
>>>      N_("git remote rename <old> <new>"),
>>>      N_("git remote remove <name>"),
>>>      N_("git remote set-head <name> (-a | --auto | -d | --delete |<branch>)"),
>>> -    N_("git remote [-v | --verbose] show [-n] <name>"),
>>> +    N_("git remote show [-n] <name>"),
>>>      N_("git remote prune [-n | --dry-run] <name>"),
>>>      N_("git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"),
>>>      N_("git remote set-branches [--add] <name> <branch>..."),
>>>
>
> I however have a bit larger question.  Does it make sense to have
> [-v/--verbose] in front of some but not all of the subcommands?
>
> For example, the above snippet gives me an impression that
>
>     $ git remote -v prune -n origin
>
> should not work, but that does not seem to be the case.



-- 
_________________________
0xAX

Re: [PATCH 1/2] remote: Remove -v/--verbose option from git remote show synopsis

[Junio C Hamano]

Alexander Kuleshov <kuleshovmail@gmail.com> writes:

> git remote show doesn't use -v/--verbose option
>
> Signed-off-by: Alexander Kuleshov <kuleshovmail@gmail.com>

Thanks.  

I think these two patches should be squashed into one (which I can
do locally without asking you to resend) but they are good changes.
The subcommand does not just "not use", but it does not even support
(i.e. it throws an error when the option is given).

> ---
>  builtin/remote.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/builtin/remote.c b/builtin/remote.c
> index 46ecfd9..978c645 100644
> --- a/builtin/remote.c
> +++ b/builtin/remote.c
> @@ -14,7 +14,7 @@ static const char * const builtin_remote_usage[] = {
>  	N_("git remote rename <old> <new>"),
>  	N_("git remote remove <name>"),
>  	N_("git remote set-head <name> (-a | --auto | -d | --delete |<branch>)"),
> -	N_("git remote [-v | --verbose] show [-n] <name>"),
> +	N_("git remote show [-n] <name>"),
>  	N_("git remote prune [-n | --dry-run] <name>"),
>  	N_("git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"),
>  	N_("git remote set-branches [--add] <name> <branch>..."),