Re: [PATCH] branch: reject -D/-d without branch name

2013-01-25 Thread Duy Nguyen
On Fri, Jan 25, 2013 at 3:45 PM, Matthieu Moy
 wrote:
> Nguyễn Thái Ngọc Duy  writes:
>
>> diff --git a/builtin/branch.c b/builtin/branch.c
>> index 873f624..1d3e842 100644
>> --- a/builtin/branch.c
>> +++ b/builtin/branch.c
>> @@ -837,7 +837,7 @@ int cmd_branch(int argc, const char **argv, const char 
>> *prefix)
>>   colopts = 0;
>>   }
>>
>> - if (delete)
>> + if (delete && argc)
>>   return delete_branches(argc, argv, delete > 1, kinds, quiet);
>>   else if (list) {
>>   int ret = print_ref_list(kinds, detached, verbose, abbrev,
>
> Shouldn't this error out with a clean error message ("branch name
> expected" or so)?

Yeah. But on the other hand, this command seems to prefer to print
help usage when incorrect number of arguments is given (checkout
blocks "if (edit_description)" and "if (rename)" in cmd_branch).
Should those be fixed too?
-- 
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


Re: [PATCH] branch: reject -D/-d without branch name

2013-01-25 Thread Matthieu Moy
Nguyễn Thái Ngọc Duy  writes:

> diff --git a/builtin/branch.c b/builtin/branch.c
> index 873f624..1d3e842 100644
> --- a/builtin/branch.c
> +++ b/builtin/branch.c
> @@ -837,7 +837,7 @@ int cmd_branch(int argc, const char **argv, const char 
> *prefix)
>   colopts = 0;
>   }
>  
> - if (delete)
> + if (delete && argc)
>   return delete_branches(argc, argv, delete > 1, kinds, quiet);
>   else if (list) {
>   int ret = print_ref_list(kinds, detached, verbose, abbrev,

Shouldn't this error out with a clean error message ("branch name
expected" or so)?

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--
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