kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'ks/branch-tweak-error-message-for-extra-args' 

Error message tweak.

* ks/branch-tweak-error-message-for-extra-args:
  branch: change the error messages to be more meaningful
maint
Junio C Hamano 2017-10-07 16:27:55 +09:00
parent da15b78e52 f777623514
commit 932b573406
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builtin/branch.c
View File

@ -744,12 +744,12 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
else if (argc == 2)
copy_or_rename_branch(argv[0], argv[1], 0, rename > 1);
else
die(_("too many branches for a rename operation"));
die(_("too many arguments for a rename operation"));
} else if (new_upstream) {
struct branch *branch = branch_get(argv[0]);

if (argc > 1)
die(_("too many branches to set new upstream"));
die(_("too many arguments to set new upstream"));

if (!branch) {
if (!argc || !strcmp(argv[0], "HEAD"))
@ -772,7 +772,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
struct strbuf buf = STRBUF_INIT;

if (argc > 1)
die(_("too many branches to unset upstream"));
die(_("too many arguments to unset upstream"));

if (!branch) {
if (!argc || !strcmp(argv[0], "HEAD"))