branch: change the error messages to be more meaningful
The error messages shown when the branch command is misused by supplying it wrong number of parameters wasn't meaningful. That's because it used the the phrase "too many branches" assuming all parameters to be "valid" branch names. It's not always the case as exemplified below, $ git branch foo * master $ git branch -m foo foo old fatal: too many branches for a rename operation Change the messages to be more general thus making no assumptions about the "parameters". Signed-off-by: Kaartic Sivaraam <kaarticsivaraam91196@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Kaartic Sivaraam committed
Aug 21, 2017 at 19:06 UTC
f77762351445a73bbafc1464b4676d046e726468
1 file changed
+3
-3
builtin/branch.c
+3
-3
@@ -711,12 +711,12 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
711
else if (argc == 2)
712
rename_branch(argv[0], argv[1], rename > 1);
713
else
714
- die(_("too many branches for a rename operation"));
714
+ die(_("too many arguments for a rename operation"));
715
} else if (new_upstream) {
716
struct branch *branch = branch_get(argv[0]);
717
718
if (argc > 1)
719
- die(_("too many branches to set new upstream"));
719
+ die(_("too many arguments to set new upstream"));
720
721
if (!branch) {
722
if (!argc || !strcmp(argv[0], "HEAD"))
@@ -739,7 +739,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
739
struct strbuf buf = STRBUF_INIT;
740
741
if (argc > 1)
742
- die(_("too many branches to unset upstream"));
742
+ die(_("too many arguments to unset upstream"));
743
744
if (!branch) {
745
if (!argc || !strcmp(argv[0], "HEAD"))