diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-06-05 12:00:29 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-06-05 12:00:29 -0700 |
| commit | cbac7067a406380dd0061ecdd990a5e64ca88abf (patch) | |
| tree | 3990a3bc10cbb1b6ae90a135456b98ab00878110 /builtin | |
| parent | c538004ccb643388020b0e362409e469ed50d054 (diff) | |
| parent | ccd593cffaa020ff767860ec211462b8dbd727a6 (diff) | |
| download | git-cbac7067a406380dd0061ecdd990a5e64ca88abf.tar.gz git-cbac7067a406380dd0061ecdd990a5e64ca88abf.tar.xz | |
Merge branch 'dl/branch-error-message' into maint
Error messages from "git branch" called remote-tracking branches as
"remote branches".
* dl/branch-error-message:
branch: do not call a "remote-tracking branch" a "remote branch"
Diffstat (limited to 'builtin')
| -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 1d150378e..a0a03fc6d 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -242,7 +242,7 @@ static int delete_branches(int argc, const char **argv, int force, int kinds, sha1, &flags); if (!target) { error(remote_branch - ? _("remote branch '%s' not found.") + ? _("remote-tracking branch '%s' not found.") : _("branch '%s' not found."), bname.buf); ret = 1; continue; @@ -257,7 +257,7 @@ static int delete_branches(int argc, const char **argv, int force, int kinds, if (delete_ref(name, sha1, REF_NODEREF)) { error(remote_branch - ? _("Error deleting remote branch '%s'") + ? _("Error deleting remote-tracking branch '%s'") : _("Error deleting branch '%s'"), bname.buf); ret = 1; @@ -265,7 +265,7 @@ static int delete_branches(int argc, const char **argv, int force, int kinds, } if (!quiet) { printf(remote_branch - ? _("Deleted remote branch %s (was %s).\n") + ? _("Deleted remote-tracking branch %s (was %s).\n") : _("Deleted branch %s (was %s).\n"), bname.buf, (flags & REF_ISBROKEN) ? "broken" |