Re: [PATCH] branch: -r -d(D) should say "remote-tracking branch"

From: Junio C Hamano <gitster@pobox.com>
Date: May 6, 2015, 20:29 UTC
Message-ID: <xmqqtwvpsb5e.fsf@gitster.dls.corp.google.com>
In-Reply-To: <CAMbsUu4iAD0kGh_ZzbLBS4P69Hz-T4Mv0krLst+M7SVc=v=Dog@mail.gmail.com>

Danny Lin <danny0838@gmail.com> writes:

Show 5 quoted lines

> git branch -r -d(D) currently says "delete remote branch",
> which should be "remote-tracking branch".
>
> Signed-off-by: Danny Lin <danny0838@gmail.com>
> ---

Thanks.

The patch is whitespace damaged and does not apply, though. I manually typed the same change and commited with a tweaked log message, so no need to resend this one, but for future reference, please try sending a patch to yourself and make sure it applies cleanly (and if it doesn't, figure out where tabs are eaten and lines are wrapped and fix that problem before sending the patch to the list).

Show 37 quoted lines

>  builtin/branch.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/builtin/branch.c b/builtin/branch.c
> index dc6f0b2..3560c51 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"