From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 7 Oct 2017 07:27:55 +0000 (+0900)
Subject: Merge branch 'ks/branch-tweak-error-message-for-extra-args'
X-Git-Tag: v2.15.0-rc1~17
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=932b573406fda922d8edbecb0d7f9ad3ce9155ec;p=git

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
---

932b573406fda922d8edbecb0d7f9ad3ce9155ec
diff --cc builtin/branch.c
index d7a876cca3,6aba134db8..b67593288c
--- a/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]);