From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 01 Apr 2013 02:51:53 GMT
Subject: Re: [PATCH] branch: give better message when no names specified for rename
Message-ID: <7vfvzbm08m.fsf@alter.siamese.dyndns.org>
In-Reply-To: <00E97900-F00D-455F-A3EB-52D0A3CF5CF6@JonathonMah.com>

Jonathon Mah <me@JonathonMah.com> writes:

> Signed-off-by: Jonathon Mah <me@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.