Re: [PATCH] branch: give better message when no names specified for rename

[Junio C Hamano]

Junio C Hamano  writes:

> Jonathon Mah  writes:
>
>> Signed-off-by: Jonathon Mah 
>> ---
>>
>> The previous message was incorrect when not enough arguments were
>> specified:
>> 
>> $ git branch -m 
>> fatal: too many branches for a rename operation
>>
>> I changed to "branch name required" instead of "new branch name required" in 
>> the hope that existing translations can be used.
>>
>>  builtin/branch.c | 4 +++-
>>  1 file changed, 3 insertions(+), 1 deletion(-)
>>
>> diff --git a/builtin/branch.c b/builtin/branch.c
>> index 00d17d2..580107f 100644
>> --- a/builtin/branch.c
>> +++ b/builtin/branch.c
>> @@ -880,7 +880,9 @@ int cmd_branch(int argc, const char **argv, const char 
>> *prefix)
>>  if (edit_branch_description(branch_name))
>>  return 1;
>>  } else if (rename) {
>> -if (argc == 1)
>> +if (!argc)
>> +die(_("branch name required"));
>> +else if (argc == 1)
>>  rename_branch(head, argv[0], rename > 1);
>>  else if (argc == 2)
>>  rename_branch(argv[0], argv[1], rename > 1);
>
> Obviously a good thing to do; thanks.

Next time, please run the testsuite before sending a patch.  I've
fixed t3200 locally when queuing this patch, so no need to resend
this one.

Thanks.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] branch: give better message when no names specified for rename

[Junio C Hamano]

Jonathon Mah  writes:

> Signed-off-by: Jonathon Mah 
> ---
>
> The previous message was incorrect when not enough arguments were
> specified:
> 
> $ git branch -m 
> fatal: too many branches for a rename operation
>
> I changed to "branch name required" instead of "new branch name required" in 
> the hope that existing translations can be used.
>
>  builtin/branch.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/builtin/branch.c b/builtin/branch.c
> index 00d17d2..580107f 100644
> --- a/builtin/branch.c
> +++ b/builtin/branch.c
> @@ -880,7 +880,9 @@ int cmd_branch(int argc, const char **argv, const char 
> *prefix)
>   if (edit_branch_description(branch_name))
>   return 1;
>   } else if (rename) {
> - if (argc == 1)
> + if (!argc)
> + die(_("branch name required"));
> + else if (argc == 1)
>   rename_branch(head, argv[0], rename > 1);
>   else if (argc == 2)
>   rename_branch(argv[0], argv[1], rename > 1);

Obviously a good thing to do; thanks.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] branch: give better message when no names specified for rename

[Duy Nguyen]

On Sun, Mar 31, 2013 at 8:27 AM, Jonathon Mah  wrote:
> -   if (argc == 1)
> +   if (!argc)
> +   die(_("branch name required"));
> +   else if (argc == 1)
> rename_branch(head, argv[0], rename > 1);
> else if (argc == 2)
> rename_branch(argv[0], argv[1], rename > 1);

This makes four branches based on argc. Maybe we should convert
if/else chain to switch/case.
--
Duy
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH] branch: give better message when no names specified for rename

[Jonathon Mah]

Signed-off-by: Jonathon Mah 
---

The previous message was incorrect when not enough arguments were
specified:

$ git branch -m 
fatal: too many branches for a rename operation

I changed to "branch name required" instead of "new branch name required" in 
the hope that existing translations can be used.

 builtin/branch.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/builtin/branch.c b/builtin/branch.c
index 00d17d2..580107f 100644
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -880,7 +880,9 @@ int cmd_branch(int argc, const char **argv, const char 
*prefix)
if (edit_branch_description(branch_name))
return 1;
} else if (rename) {
-   if (argc == 1)
+   if (!argc)
+   die(_("branch name required"));
+   else if (argc == 1)
rename_branch(head, argv[0], rename > 1);
else if (argc == 2)
rename_branch(argv[0], argv[1], rename > 1);
-- 
1.8.2.279.g631bc94


--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html