kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'dl/branch-error-message' 

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"
maint
Junio C Hamano 2015-05-22 12:41:41 -07:00
parent 6c1249c503 ccd593cffa
commit 086d0d4ab6
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builtin/branch.c
View File

@ -242,7 +242,7 @@ static int delete_branches(int argc, const char **argv, int force, int kinds,
sha1, &flags); sha1, &flags);
if (!target) { if (!target) {
error(remote_branch error(remote_branch
? _("remote branch '%s' not found.") ? _("remote-tracking branch '%s' not found.")
: _("branch '%s' not found."), bname.buf); : _("branch '%s' not found."), bname.buf);
ret = 1; ret = 1;
continue; 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)) { if (delete_ref(name, sha1, REF_NODEREF)) {
error(remote_branch error(remote_branch
? _("Error deleting remote branch '%s'") ? _("Error deleting remote-tracking branch '%s'")
: _("Error deleting branch '%s'"), : _("Error deleting branch '%s'"),
bname.buf); bname.buf);
ret = 1; ret = 1;
@ -265,7 +265,7 @@ static int delete_branches(int argc, const char **argv, int force, int kinds,
} }
if (!quiet) { if (!quiet) {
printf(remote_branch printf(remote_branch
? _("Deleted remote branch %s (was %s).\n") ? _("Deleted remote-tracking branch %s (was %s).\n")
: _("Deleted branch %s (was %s).\n"), : _("Deleted branch %s (was %s).\n"),
bname.buf, bname.buf,
(flags & REF_ISBROKEN) ? "broken" (flags & REF_ISBROKEN) ? "broken"