branch: do not call a "remote-tracking branch" a "remote branch"

"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>

diff --git a/builtin/branch.c b/builtin/branch.c
index 3b79c5087fbf1157d1bdfa2cccc99547f8abdb09..68ac4c4e9f45086bc22c9d65c9c13202906ddec6 100644 (file)
--- 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
                                            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;
                              : _("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
 
                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;
                              : _("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
                }
                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"
                               : _("Deleted branch %s (was %s).\n"),
                               bname.buf,
                               (flags & REF_ISBROKEN) ? "broken"