[PATCH v2] branch: change the error messages to be more meaningful
From: Kaartic Sivaraam <hidden>
Date: 2017-08-21 13:38:20
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2017-10-05 · Re: [PATCH v2] branch: change the error messages to be more meaningful · Kaartic Sivaraam <hidden>
- 2017-10-05 · Re: [PATCH v2] branch: change the error messages to be more meaningful · Junio C Hamano <hidden>
- 2017-10-04 · Re: [PATCH v2] branch: change the error messages to be more meaningful · Kaartic Sivaraam <hidden>
- 2017-10-04 · Re: [PATCH v2] branch: change the error messages to be more meaningful · Junio C Hamano <hidden>
- 2017-10-03 · Re: [PATCH v2] branch: change the error messages to be more meaningful · Kaartic Sivaraam <hidden>
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 <redacted>
---
Changes in v2:
- changed the wordings of the error message
builtin/branch.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/builtin/branch.c b/builtin/branch.c
index a3bd2262b..62981d358 100644
--- a/builtin/branch.c
+++ b/builtin/branch.c@@ -707,12 +707,12 @@ int cmd_branch(int argc, const char **argv, const char *prefix) else if (argc == 2) rename_branch(argv[0], argv[1], 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"))
@@ -735,7 +735,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"))
--
2.14.0.rc1.434.g6eded367a