diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-10-07 16:27:55 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-10-07 16:27:55 +0900 |
| commit | 932b573406fda922d8edbecb0d7f9ad3ce9155ec (patch) | |
| tree | c2a38c710716cc4e77c5dd1e51e45a0a839cf471 /builtin/branch.c | |
| parent | da15b78e52642bd45fd5513ab0000fdf2e58a6f4 (diff) | |
| parent | f77762351445a73bbafc1464b4676d046e726468 (diff) | |
| download | git-932b573406fda922d8edbecb0d7f9ad3ce9155ec.tar.gz | |
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
Diffstat (limited to 'builtin/branch.c')
| -rw-r--r-- | builtin/branch.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin/branch.c b/builtin/branch.c index d7a876cca3..b67593288c 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -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")) |