Skip to content

Commit

Permalink
branch: do not call a "remote-tracking branch" a "remote branch"
Browse files Browse the repository at this point in the history
"git branch -r -d" mentions "delete remote branch", which should be
"remote-tracking branch".

Signed-off-by: Danny Lin <danny0838@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Danny Lin authored and Junio C Hamano committed May 6, 2015
1 parent fdf96a2 commit ccd593c
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions builtin/branch.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -257,15 +257,15 @@ 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;
continue;
}
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"
Expand Down

0 comments on commit ccd593c

Please sign in to comment.