public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed

From: Junio C Hamano <gitster@pobox•com>
To: Ralf Thielow <ralf.thielow@gmail•com>
Cc: Danny Lin <danny0838@gmail•com>, git <git@vger•kernel.org>
Subject: Re: [PATCH] branch: -r -d(D) should say "remote-tracking branch"
Date: Wed, 06 May 2015 10:53:54 -0700	[thread overview]
Message-ID: <xmqq4mnpvbgt.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <CAN0XMOJ8QJ14B15BoFrr7d7L-jE06yUbquo8pW3OCj4wmUk2Rw@mail.gmail.com> (Ralf Thielow's message of "Wed, 6 May 2015 19:49:19 +0200")

Ralf Thielow <ralf.thielow@gmail•com> writes:

> Danny Lin <danny0838@gmail•com> wrote:
>> git branch -r -d(D) currently says "delete remote branch",
>> which should be "remote-tracking branch".
>> ---
>
> No "Signed-off-by" line. (see Documentation/SubmittingPatches)
>
>>  builtin/branch.c | 6 +++---
>>  po/bg.po         | 6 +++---
>>  po/ca.po         | 6 +++---
>>  po/de.po         | 6 +++---
>>  po/fr.po         | 6 +++---
>>  po/git.pot       | 6 +++---
>>  po/it.po         | 6 +++---
>>  po/pt_PT.po      | 6 +++---
>>  po/sv.po         | 6 +++---
>>  po/vi.po         | 6 +++---
>>  po/zh_CN.po      | 6 +++---
>>  11 files changed, 33 insertions(+), 33 deletions(-)
>>
>
> You don't need to update messages within "po/*" as they're
> updated by the l10n coordinator and translators.

Thanks for pointing it out, but the language should be stronger; not
"don't need to", but "you must not".

Thanks.

>> 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"
>
> Looks good to me.

next prev parent reply	other threads:[~2015-05-06 17:54 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-06  9:46 [PATCH] branch: -r -d(D) should say "remote-tracking branch" Danny Lin
2015-05-06 17:49 ` Ralf Thielow
2015-05-06 17:53   ` Junio C Hamano [this message]
2015-05-06 19:01     ` Danny Lin
2015-05-06 20:29       ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqq4mnpvbgt.fsf@gitster.dls.corp.google.com \
    --to=gitster@pobox$(echo .)com \
    --cc=danny0838@gmail$(echo .)com \
    --cc=git@vger$(echo .)kernel.org \
    --cc=ralf.thielow@gmail$(echo .)com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox