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

diff --cc builtin/branch.c
index d7a876cca3157f58dfd88936e53f5f52076ab702,6aba134db884d3178ebfa5d12608488f16989e27..b67593288cf54084b569763ba2ef8e3b2cf9aa97
--- 1/builtin/branch.c
--- 2/builtin/branch.c
+++ b/builtin/branch.c
@@@ -740,11 -707,11 +740,11 @@@ int cmd_branch(int argc, const char **a
                if (!argc)
                        die(_("branch name required"));
                else if (argc == 1)
 -                      rename_branch(head, argv[0], rename > 1);
 +                      copy_or_rename_branch(head, argv[0], 0, rename > 1);
                else if (argc == 2)
 -                      rename_branch(argv[0], argv[1], rename > 1);
 +                      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]);