Junio C Hamano <gits...@pobox.com> writes:

> Jonathon Mah <m...@jonathonmah.com> writes:
>
>> Signed-off-by: Jonathon Mah <m...@jonathonmah.com>
>> ---
>>
>> 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

Reply via email to