{"thread":{"id":"39259","subject":"[PATCH] branch: -r -d(D) should say \"remote-tracking branch\"","startedAt":"2015-05-06T09:46:30Z","lastAt":"2015-05-06T20:29:01Z","messageCount":5,"participants":["Danny Lin","Ralf Thielow","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"260660","messageId":"CAMbsUu5pKiQ76WrCXvziQ8zER-Mc5oVt7tGnC7Q3RMVX2r8ZXQ@mail.gmail.com","threadId":"39259","inReplyTo":null,"subject":"[PATCH] branch: -r -d(D) should say \"remote-tracking branch\"","fromName":"Danny Lin","fromEmail":"danny0838@gmail.com","sentAt":"2015-05-06T09:46:30Z","receivedAt":"2015-05-06T09:46:30Z","isPatch":true,"sender":{"key":"danny0838@gmail.com","avatar":"https://avatars.githubusercontent.com/u/531417?v=4"},"body":"git branch -r -d(D) currently says \"delete remote branch\",\nwhich should be \"remote-tracking branch\".\n---\n builtin/branch.c | 6 +++---\n po/bg.po         | 6 +++---\n po/ca.po         | 6 +++---\n po/de.po         | 6 +++---\n po/fr.po         | 6 +++---\n po/git.pot       | 6 +++---\n po/it.po         | 6 +++---\n po/pt_PT.po      | 6 +++---\n po/sv.po         | 6 +++---\n po/vi.po         | 6 +++---\n po/zh_CN.po      | 6 +++---\n 11 files changed, 33 insertions(+), 33 deletions(-)\n\ndiff --git a/builtin/branch.c b/builtin/branch.c\nindex dc6f0b2..3560c51 100644\n--- a/builtin/branch.c\n+++ b/builtin/branch.c\n@@ -242,7 +242,7 @@ static int delete_branches(int argc, const char\n**argv, int force, int kinds,\n                         sha1, &flags);\n         if (!target) {\n             error(remote_branch\n-                  ? _(\"remote branch '%s' not found.\")\n+                  ? _(\"remote-tracking branch '%s' not found.\")\n                   : _(\"branch '%s' not found.\"), bname.buf);\n             ret = 1;\n             continue;\n@@ -257,7 +257,7 @@ static int delete_branches(int argc, const char\n**argv, int force, int kinds,\n\n         if (delete_ref(name, sha1, REF_NODEREF)) {\n             error(remote_branch\n-                  ? _(\"Error deleting remote branch '%s'\")\n+                  ? _(\"Error deleting remote-tracking branch '%s'\")\n                   : _(\"Error deleting branch '%s'\"),\n                   bname.buf);\n             ret = 1;\n@@ -265,7 +265,7 @@ static int delete_branches(int argc, const char\n**argv, int force, int kinds,\n         }\n         if (!quiet) {\n             printf(remote_branch\n-                   ? _(\"Deleted remote branch %s (was %s).\\n\")\n+                   ? _(\"Deleted remote-tracking branch %s (was %s).\\n\")\n                    : _(\"Deleted branch %s (was %s).\\n\"),\n                    bname.buf,\n                    (flags & REF_ISBROKEN) ? \"broken\"\ndiff --git a/po/bg.po b/po/bg.po\nindex ccdd11e..8abde0f 100644\n--- a/po/bg.po\n+++ b/po/bg.po\n@@ -3037,7 +3037,7 @@ msgstr \"Не можете да изтриете клона „%s“, защот\n\n #: builtin/branch.c:245\n #, c-format\n-msgid \"remote branch '%s' not found.\"\n+msgid \"remote-tracking branch '%s' not found.\"\n msgstr \"отдалеченият клон „%s“ не може да бъде открит.\"\n\n #: builtin/branch.c:246\n@@ -3047,7 +3047,7 @@ msgstr \"клонът „%s“ не може да бъде открит.\"\n\n #: builtin/branch.c:260\n #, c-format\n-msgid \"Error deleting remote branch '%s'\"\n+msgid \"Error deleting remote-tracking branch '%s'\"\n msgstr \"Грешка при изтриването на отдалечения клон „%s“\"\n\n #: builtin/branch.c:261\n@@ -3057,7 +3057,7 @@ msgstr \"Грешка при изтриването на клона „%s“\"\n\n #: builtin/branch.c:268\n #, c-format\n-msgid \"Deleted remote branch %s (was %s).\\n\"\n+msgid \"Deleted remote-tracking branch %s (was %s).\\n\"\n msgstr \"Изтрит отдалечен клон „%s“ (той сочеше към „%s“).\\n\"\n\n #: builtin/branch.c:269\ndiff --git a/po/ca.po b/po/ca.po\nindex a649508..8d5992d 100644\n--- a/po/ca.po\n+++ b/po/ca.po\n@@ -2857,7 +2857,7 @@ msgstr \"No es pot suprimir la branca '%s', en la\nqual sou actualment.\"\n\n #: builtin/branch.c:245\n #, c-format\n-msgid \"remote branch '%s' not found.\"\n+msgid \"remote-tracking branch '%s' not found.\"\n msgstr \"no s'ha trobat la branca remota '%s'.\"\n\n #: builtin/branch.c:246\n@@ -2867,7 +2867,7 @@ msgstr \"no s'ha trobat la branca '%s'.\"\n\n #: builtin/branch.c:260\n #, c-format\n-msgid \"Error deleting remote branch '%s'\"\n+msgid \"Error deleting remote-tracking branch '%s'\"\n msgstr \"Error en suprimir la branca remota '%s'\"\n\n #: builtin/branch.c:261\n@@ -2877,7 +2877,7 @@ msgstr \"Error en suprimir la branca '%s'\"\n\n #: builtin/branch.c:268\n #, c-format\n-msgid \"Deleted remote branch %s (was %s).\\n\"\n+msgid \"Deleted remote-tracking branch %s (was %s).\\n\"\n msgstr \"S'ha suprimit la branca remota %s (ha estat %s).\\n\"\n\n #: builtin/branch.c:269\ndiff --git a/po/de.po b/po/de.po\nindex 11fbd0f..5c7c0e2 100644\n--- a/po/de.po\n+++ b/po/de.po\n@@ -2907,7 +2907,7 @@ msgstr \"\"\n\n #: builtin/branch.c:245\n #, c-format\n-msgid \"remote branch '%s' not found.\"\n+msgid \"remote-tracking branch '%s' not found.\"\n msgstr \"Remote-Branch '%s' nicht gefunden\"\n\n #: builtin/branch.c:246\n@@ -2917,7 +2917,7 @@ msgstr \"Branch '%s' nicht gefunden.\"\n\n #: builtin/branch.c:260\n #, c-format\n-msgid \"Error deleting remote branch '%s'\"\n+msgid \"Error deleting remote-tracking branch '%s'\"\n msgstr \"Fehler beim Entfernen des Remote-Branches '%s'\"\n\n #: builtin/branch.c:261\n@@ -2927,7 +2927,7 @@ msgstr \"Fehler beim Entfernen des Branches '%s'\"\n\n #: builtin/branch.c:268\n #, c-format\n-msgid \"Deleted remote branch %s (was %s).\\n\"\n+msgid \"Deleted remote-tracking branch %s (was %s).\\n\"\n msgstr \"Remote-Branch %s entfernt (war %s).\\n\"\n\n #: builtin/branch.c:269\ndiff --git a/po/fr.po b/po/fr.po\nindex 3235879..2b5ea7a 100644\n--- a/po/fr.po\n+++ b/po/fr.po\n@@ -2945,7 +2945,7 @@ msgstr \"Impossible de supprimer la branche '%s'\nsur laquelle vous êtes.\"\n\n #: builtin/branch.c:245\n #, c-format\n-msgid \"remote branch '%s' not found.\"\n+msgid \"remote-tracking branch '%s' not found.\"\n msgstr \"branche distante %s' non trouvée.\"\n\n #: builtin/branch.c:246\n@@ -2955,7 +2955,7 @@ msgstr \"branche '%s' non trouvée.\"\n\n #: builtin/branch.c:260\n #, c-format\n-msgid \"Error deleting remote branch '%s'\"\n+msgid \"Error deleting remote-tracking branch '%s'\"\n msgstr \"Erreur lors de la suppression de la branche distante '%s'\"\n\n #: builtin/branch.c:261\n@@ -2965,7 +2965,7 @@ msgstr \"Erreur lors de la suppression de la branche '%s'\"\n\n #: builtin/branch.c:268\n #, c-format\n-msgid \"Deleted remote branch %s (was %s).\\n\"\n+msgid \"Deleted remote-tracking branch %s (was %s).\\n\"\n msgstr \"Branche distante %s supprimée (précédemment %s).\\n\"\n\n #: builtin/branch.c:269\ndiff --git a/po/git.pot b/po/git.pot\nindex 91fa5a1..4263f6e 100644\n--- a/po/git.pot\n+++ b/po/git.pot\n@@ -2708,7 +2708,7 @@ msgstr \"\"\n\n #: builtin/branch.c:245\n #, c-format\n-msgid \"remote branch '%s' not found.\"\n+msgid \"remote-tracking branch '%s' not found.\"\n msgstr \"\"\n\n #: builtin/branch.c:246\n@@ -2718,7 +2718,7 @@ msgstr \"\"\n\n #: builtin/branch.c:260\n #, c-format\n-msgid \"Error deleting remote branch '%s'\"\n+msgid \"Error deleting remote-tracking branch '%s'\"\n msgstr \"\"\n\n #: builtin/branch.c:261\n@@ -2728,7 +2728,7 @@ msgstr \"\"\n\n #: builtin/branch.c:268\n #, c-format\n-msgid \"Deleted remote branch %s (was %s).\\n\"\n+msgid \"Deleted remote-tracking branch %s (was %s).\\n\"\n msgstr \"\"\n\n #: builtin/branch.c:269\ndiff --git a/po/it.po b/po/it.po\nindex 9080219..e391e29 100644\n--- a/po/it.po\n+++ b/po/it.po\n@@ -1514,7 +1514,7 @@ msgstr \"\"\n\n #: builtin/branch.c:202\n #, c-format\n-msgid \"remote branch '%s' not found.\"\n+msgid \"remote-tracking branch '%s' not found.\"\n msgstr \"il branch remoto '%s' non è stato trovato.\"\n\n #: builtin/branch.c:203\n@@ -1536,7 +1536,7 @@ msgstr \"\"\n\n #: builtin/branch.c:225\n #, c-format\n-msgid \"Error deleting remote branch '%s'\"\n+msgid \"Error deleting remote-tracking branch '%s'\"\n msgstr \"Errore nella rimozione del branch remoto '%s'\"\n\n #: builtin/branch.c:226\n@@ -1546,7 +1546,7 @@ msgstr \"Errore nella rimozione del branch '%s'\"\n\n #: builtin/branch.c:233\n #, c-format\n-msgid \"Deleted remote branch %s (was %s).\\n\"\n+msgid \"Deleted remote-tracking branch %s (was %s).\\n\"\n msgstr \"Ramo remoto %s eliminato (era %s).\\n\"\n\n #: builtin/branch.c:234\ndiff --git a/po/pt_PT.po b/po/pt_PT.po\nindex 689ad1b..6ef1b35 100644\n--- a/po/pt_PT.po\n+++ b/po/pt_PT.po\n@@ -1379,7 +1379,7 @@ msgstr \"\"\n\n #: builtin/branch.c:202\n #, c-format\n-msgid \"remote branch '%s' not found.\"\n+msgid \"remote-tracking branch '%s' not found.\"\n msgstr \"rama remota '%s não encontrada.\"\n\n #: builtin/branch.c:203\n@@ -1401,7 +1401,7 @@ msgstr \"\"\n\n #: builtin/branch.c:225\n #, c-format\n-msgid \"Error deleting remote branch '%s'\"\n+msgid \"Error deleting remote-tracking branch '%s'\"\n msgstr \"\"\n\n #: builtin/branch.c:226\n@@ -1411,7 +1411,7 @@ msgstr \"Erro a eliminar rama '%s'\"\n\n #: builtin/branch.c:233\n #, c-format\n-msgid \"Deleted remote branch %s (was %s).\\n\"\n+msgid \"Deleted remote-tracking branch %s (was %s).\\n\"\n msgstr \"\"\n\n #: builtin/branch.c:234\ndiff --git a/po/sv.po b/po/sv.po\nindex 0440443..e71d1d2 100644\n--- a/po/sv.po\n+++ b/po/sv.po\n@@ -2811,7 +2811,7 @@ msgstr \"Kan inte ta bort grenen \\\"%s\\\" som du\nbefinner dig på för närvarande.\n\n #: builtin/branch.c:245\n #, c-format\n-msgid \"remote branch '%s' not found.\"\n+msgid \"remote-tracking branch '%s' not found.\"\n msgstr \"fjärrgrenen \\\"%s\\\" hittades inte.\"\n\n #: builtin/branch.c:246\n@@ -2821,7 +2821,7 @@ msgstr \"grenen \\\"%s\\\" hittades inte.\"\n\n #: builtin/branch.c:260\n #, c-format\n-msgid \"Error deleting remote branch '%s'\"\n+msgid \"Error deleting remote-tracking branch '%s'\"\n msgstr \"Fel vid borttagning av fjärrgrenen \\\"%s\\\"\"\n\n #: builtin/branch.c:261\n@@ -2831,7 +2831,7 @@ msgstr \"Fel vid borttagning av grenen \\\"%s\\\"\"\n\n #: builtin/branch.c:268\n #, c-format\n-msgid \"Deleted remote branch %s (was %s).\\n\"\n+msgid \"Deleted remote-tracking branch %s (was %s).\\n\"\n msgstr \"Tog bort fjärrgrenen %s (var %s).\\n\"\n\n #: builtin/branch.c:269\ndiff --git a/po/vi.po b/po/vi.po\nindex 9c2bba8..c6ceb5a 100644\n--- a/po/vi.po\n+++ b/po/vi.po\n@@ -2842,7 +2842,7 @@ msgstr \"Không thể xóa nhánh “%s” cái mà bạn hiện\nnay đang ở.\"\n\n #: builtin/branch.c:245\n #, c-format\n-msgid \"remote branch '%s' not found.\"\n+msgid \"remote-tracking branch '%s' not found.\"\n msgstr \"không tìm thấy nhánh máy chủ “%s”.\"\n\n #: builtin/branch.c:246\n@@ -2852,7 +2852,7 @@ msgstr \"không tìm thấy nhánh “%s”.\"\n\n #: builtin/branch.c:260\n #, c-format\n-msgid \"Error deleting remote branch '%s'\"\n+msgid \"Error deleting remote-tracking branch '%s'\"\n msgstr \"Gặp lỗi khi đang xóa nhánh trên máy chủ “%s”\"\n\n #: builtin/branch.c:261\n@@ -2862,7 +2862,7 @@ msgstr \"Gặp lỗi khi xóa bỏ nhánh “%s”\"\n\n #: builtin/branch.c:268\n #, c-format\n-msgid \"Deleted remote branch %s (was %s).\\n\"\n+msgid \"Deleted remote-tracking branch %s (was %s).\\n\"\n msgstr \"Nhánh trên máy chủ \\\"%s\\\" đã bị xóa (từng là %s).\\n\"\n\n #: builtin/branch.c:269\ndiff --git a/po/zh_CN.po b/po/zh_CN.po\nindex 2b8d2cb..93b1916 100644\n--- a/po/zh_CN.po\n+++ b/po/zh_CN.po\n@@ -2822,7 +2822,7 @@ msgstr \"无法删除您当前所在的分支 '%s'。\"\n\n #: builtin/branch.c:245\n #, c-format\n-msgid \"remote branch '%s' not found.\"\n+msgid \"remote-tracking branch '%s' not found.\"\n msgstr \"远程分支 '%s' 未发现。\"\n\n #: builtin/branch.c:246\n@@ -2832,7 +2832,7 @@ msgstr \"分支 '%s' 未发现。\"\n\n #: builtin/branch.c:260\n #, c-format\n-msgid \"Error deleting remote branch '%s'\"\n+msgid \"Error deleting remote-tracking branch '%s'\"\n msgstr \"删除远程分支 '%s' 时出错\"\n\n #: builtin/branch.c:261\n@@ -2842,7 +2842,7 @@ msgstr \"删除分支 '%s' 时出错\"\n\n #: builtin/branch.c:268\n #, c-format\n-msgid \"Deleted remote branch %s (was %s).\\n\"\n+msgid \"Deleted remote-tracking branch %s (was %s).\\n\"\n msgstr \"已删除远程分支 %s（曾为 %s）。\\n\"\n\n #: builtin/branch.c:269\n-- \n2.3.7.windows.1\n"},{"id":"260672","messageId":"CAN0XMOJ8QJ14B15BoFrr7d7L-jE06yUbquo8pW3OCj4wmUk2Rw@mail.gmail.com","threadId":"39259","inReplyTo":"CAMbsUu5pKiQ76WrCXvziQ8zER-Mc5oVt7tGnC7Q3RMVX2r8ZXQ@mail.gmail.com","subject":"Re: [PATCH] branch: -r -d(D) should say \"remote-tracking branch\"","fromName":"Ralf Thielow","fromEmail":"ralf.thielow@gmail.com","sentAt":"2015-05-06T17:49:19Z","receivedAt":"2015-05-06T17:49:19Z","isPatch":true,"sender":{"key":"ralf.thielow@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1275832?v=4"},"body":"Danny Lin <danny0838@gmail.com> wrote:\n> git branch -r -d(D) currently says \"delete remote branch\",\n> which should be \"remote-tracking branch\".\n> ---\n\nNo \"Signed-off-by\" line. (see Documentation/SubmittingPatches)\n\n>  builtin/branch.c | 6 +++---\n>  po/bg.po         | 6 +++---\n>  po/ca.po         | 6 +++---\n>  po/de.po         | 6 +++---\n>  po/fr.po         | 6 +++---\n>  po/git.pot       | 6 +++---\n>  po/it.po         | 6 +++---\n>  po/pt_PT.po      | 6 +++---\n>  po/sv.po         | 6 +++---\n>  po/vi.po         | 6 +++---\n>  po/zh_CN.po      | 6 +++---\n>  11 files changed, 33 insertions(+), 33 deletions(-)\n>\n\nYou don't need to update messages within \"po/*\" as they're\nupdated by the l10n coordinator and translators.\n\n> diff --git a/builtin/branch.c b/builtin/branch.c\n> index dc6f0b2..3560c51 100644\n> --- a/builtin/branch.c\n> +++ b/builtin/branch.c\n> @@ -242,7 +242,7 @@ static int delete_branches(int argc, const char\n> **argv, int force, int kinds,\n>                          sha1, &flags);\n>          if (!target) {\n>              error(remote_branch\n> -                  ? _(\"remote branch '%s' not found.\")\n> +                  ? _(\"remote-tracking branch '%s' not found.\")\n>                    : _(\"branch '%s' not found.\"), bname.buf);\n>              ret = 1;\n>              continue;\n> @@ -257,7 +257,7 @@ static int delete_branches(int argc, const char\n> **argv, int force, int kinds,\n>\n>          if (delete_ref(name, sha1, REF_NODEREF)) {\n>              error(remote_branch\n> -                  ? _(\"Error deleting remote branch '%s'\")\n> +                  ? _(\"Error deleting remote-tracking branch '%s'\")\n>                    : _(\"Error deleting branch '%s'\"),\n>                    bname.buf);\n>              ret = 1;\n> @@ -265,7 +265,7 @@ static int delete_branches(int argc, const char\n> **argv, int force, int kinds,\n>          }\n>          if (!quiet) {\n>              printf(remote_branch\n> -                   ? _(\"Deleted remote branch %s (was %s).\\n\")\n> +                   ? _(\"Deleted remote-tracking branch %s (was %s).\\n\")\n>                     : _(\"Deleted branch %s (was %s).\\n\"),\n>                     bname.buf,\n>                     (flags & REF_ISBROKEN) ? \"broken\"\n\nLooks good to me.\n"},{"id":"260673","messageId":"xmqq4mnpvbgt.fsf@gitster.dls.corp.google.com","threadId":"39259","inReplyTo":"CAN0XMOJ8QJ14B15BoFrr7d7L-jE06yUbquo8pW3OCj4wmUk2Rw@mail.gmail.com","subject":"Re: [PATCH] branch: -r -d(D) should say \"remote-tracking branch\"","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2015-05-06T17:53:54Z","receivedAt":"2015-05-06T17:53:54Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Ralf Thielow <ralf.thielow@gmail.com> writes:\n\n> Danny Lin <danny0838@gmail.com> wrote:\n>> git branch -r -d(D) currently says \"delete remote branch\",\n>> which should be \"remote-tracking branch\".\n>> ---\n>\n> No \"Signed-off-by\" line. (see Documentation/SubmittingPatches)\n>\n>>  builtin/branch.c | 6 +++---\n>>  po/bg.po         | 6 +++---\n>>  po/ca.po         | 6 +++---\n>>  po/de.po         | 6 +++---\n>>  po/fr.po         | 6 +++---\n>>  po/git.pot       | 6 +++---\n>>  po/it.po         | 6 +++---\n>>  po/pt_PT.po      | 6 +++---\n>>  po/sv.po         | 6 +++---\n>>  po/vi.po         | 6 +++---\n>>  po/zh_CN.po      | 6 +++---\n>>  11 files changed, 33 insertions(+), 33 deletions(-)\n>>\n>\n> You don't need to update messages within \"po/*\" as they're\n> updated by the l10n coordinator and translators.\n\nThanks for pointing it out, but the language should be stronger; not\n\"don't need to\", but \"you must not\".\n\nThanks.\n\n>> diff --git a/builtin/branch.c b/builtin/branch.c\n>> index dc6f0b2..3560c51 100644\n>> --- a/builtin/branch.c\n>> +++ b/builtin/branch.c\n>> @@ -242,7 +242,7 @@ static int delete_branches(int argc, const char\n>> **argv, int force, int kinds,\n>>                          sha1, &flags);\n>>          if (!target) {\n>>              error(remote_branch\n>> -                  ? _(\"remote branch '%s' not found.\")\n>> +                  ? _(\"remote-tracking branch '%s' not found.\")\n>>                    : _(\"branch '%s' not found.\"), bname.buf);\n>>              ret = 1;\n>>              continue;\n>> @@ -257,7 +257,7 @@ static int delete_branches(int argc, const char\n>> **argv, int force, int kinds,\n>>\n>>          if (delete_ref(name, sha1, REF_NODEREF)) {\n>>              error(remote_branch\n>> -                  ? _(\"Error deleting remote branch '%s'\")\n>> +                  ? _(\"Error deleting remote-tracking branch '%s'\")\n>>                    : _(\"Error deleting branch '%s'\"),\n>>                    bname.buf);\n>>              ret = 1;\n>> @@ -265,7 +265,7 @@ static int delete_branches(int argc, const char\n>> **argv, int force, int kinds,\n>>          }\n>>          if (!quiet) {\n>>              printf(remote_branch\n>> -                   ? _(\"Deleted remote branch %s (was %s).\\n\")\n>> +                   ? _(\"Deleted remote-tracking branch %s (was %s).\\n\")\n>>                     : _(\"Deleted branch %s (was %s).\\n\"),\n>>                     bname.buf,\n>>                     (flags & REF_ISBROKEN) ? \"broken\"\n>\n> Looks good to me.\n"},{"id":"260679","messageId":"CAMbsUu4iAD0kGh_ZzbLBS4P69Hz-T4Mv0krLst+M7SVc=v=Dog@mail.gmail.com","threadId":"39259","inReplyTo":"xmqq4mnpvbgt.fsf@gitster.dls.corp.google.com","subject":"Re: [PATCH] branch: -r -d(D) should say \"remote-tracking branch\"","fromName":"Danny Lin","fromEmail":"danny0838@gmail.com","sentAt":"2015-05-06T19:01:55Z","receivedAt":"2015-05-06T19:01:55Z","isPatch":true,"sender":{"key":"danny0838@gmail.com","avatar":"https://avatars.githubusercontent.com/u/531417?v=4"},"body":"git branch -r -d(D) currently says \"delete remote branch\",\nwhich should be \"remote-tracking branch\".\n\nSigned-off-by: Danny Lin <danny0838@gmail.com>\n---\n builtin/branch.c | 6 +++---\n 1 file changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/builtin/branch.c b/builtin/branch.c\nindex dc6f0b2..3560c51 100644\n--- a/builtin/branch.c\n+++ b/builtin/branch.c\n@@ -242,7 +242,7 @@ static int delete_branches(int argc, const char\n**argv, int force, int kinds,\n                         sha1, &flags);\n         if (!target) {\n             error(remote_branch\n-                  ? _(\"remote branch '%s' not found.\")\n+                  ? _(\"remote-tracking branch '%s' not found.\")\n                   : _(\"branch '%s' not found.\"), bname.buf);\n             ret = 1;\n             continue;\n@@ -257,7 +257,7 @@ static int delete_branches(int argc, const char\n**argv, int force, int kinds,\n\n         if (delete_ref(name, sha1, REF_NODEREF)) {\n             error(remote_branch\n-                  ? _(\"Error deleting remote branch '%s'\")\n+                  ? _(\"Error deleting remote-tracking branch '%s'\")\n                   : _(\"Error deleting branch '%s'\"),\n                   bname.buf);\n             ret = 1;\n@@ -265,7 +265,7 @@ static int delete_branches(int argc, const char\n**argv, int force, int kinds,\n         }\n         if (!quiet) {\n             printf(remote_branch\n-                   ? _(\"Deleted remote branch %s (was %s).\\n\")\n+                   ? _(\"Deleted remote-tracking branch %s (was %s).\\n\")\n                    : _(\"Deleted branch %s (was %s).\\n\"),\n                    bname.buf,\n                    (flags & REF_ISBROKEN) ? \"broken\"\n-- \n2.3.7.windows.1\n\n\n\nrevised\n\n2015-05-07 1:53 GMT+08:00 Junio C Hamano <gitster@pobox.com>:\n> Ralf Thielow <ralf.thielow@gmail.com> writes:\n>\n>> Danny Lin <danny0838@gmail.com> wrote:\n>>> git branch -r -d(D) currently says \"delete remote branch\",\n>>> which should be \"remote-tracking branch\".\n>>> ---\n>>\n>> No \"Signed-off-by\" line. (see Documentation/SubmittingPatches)\n>>\n>>>  builtin/branch.c | 6 +++---\n>>>  po/bg.po         | 6 +++---\n>>>  po/ca.po         | 6 +++---\n>>>  po/de.po         | 6 +++---\n>>>  po/fr.po         | 6 +++---\n>>>  po/git.pot       | 6 +++---\n>>>  po/it.po         | 6 +++---\n>>>  po/pt_PT.po      | 6 +++---\n>>>  po/sv.po         | 6 +++---\n>>>  po/vi.po         | 6 +++---\n>>>  po/zh_CN.po      | 6 +++---\n>>>  11 files changed, 33 insertions(+), 33 deletions(-)\n>>>\n>>\n>> You don't need to update messages within \"po/*\" as they're\n>> updated by the l10n coordinator and translators.\n>\n> Thanks for pointing it out, but the language should be stronger; not\n> \"don't need to\", but \"you must not\".\n>\n> Thanks.\n>\n>>> diff --git a/builtin/branch.c b/builtin/branch.c\n>>> index dc6f0b2..3560c51 100644\n>>> --- a/builtin/branch.c\n>>> +++ b/builtin/branch.c\n>>> @@ -242,7 +242,7 @@ static int delete_branches(int argc, const char\n>>> **argv, int force, int kinds,\n>>>                          sha1, &flags);\n>>>          if (!target) {\n>>>              error(remote_branch\n>>> -                  ? _(\"remote branch '%s' not found.\")\n>>> +                  ? _(\"remote-tracking branch '%s' not found.\")\n>>>                    : _(\"branch '%s' not found.\"), bname.buf);\n>>>              ret = 1;\n>>>              continue;\n>>> @@ -257,7 +257,7 @@ static int delete_branches(int argc, const char\n>>> **argv, int force, int kinds,\n>>>\n>>>          if (delete_ref(name, sha1, REF_NODEREF)) {\n>>>              error(remote_branch\n>>> -                  ? _(\"Error deleting remote branch '%s'\")\n>>> +                  ? _(\"Error deleting remote-tracking branch '%s'\")\n>>>                    : _(\"Error deleting branch '%s'\"),\n>>>                    bname.buf);\n>>>              ret = 1;\n>>> @@ -265,7 +265,7 @@ static int delete_branches(int argc, const char\n>>> **argv, int force, int kinds,\n>>>          }\n>>>          if (!quiet) {\n>>>              printf(remote_branch\n>>> -                   ? _(\"Deleted remote branch %s (was %s).\\n\")\n>>> +                   ? _(\"Deleted remote-tracking branch %s (was %s).\\n\")\n>>>                     : _(\"Deleted branch %s (was %s).\\n\"),\n>>>                     bname.buf,\n>>>                     (flags & REF_ISBROKEN) ? \"broken\"\n>>\n>> Looks good to me.\n"},{"id":"260691","messageId":"xmqqtwvpsb5e.fsf@gitster.dls.corp.google.com","threadId":"39259","inReplyTo":"CAMbsUu4iAD0kGh_ZzbLBS4P69Hz-T4Mv0krLst+M7SVc=v=Dog@mail.gmail.com","subject":"Re: [PATCH] branch: -r -d(D) should say \"remote-tracking branch\"","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2015-05-06T20:29:01Z","receivedAt":"2015-05-06T20:29:01Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Danny Lin <danny0838@gmail.com> writes:\n\n> git branch -r -d(D) currently says \"delete remote branch\",\n> which should be \"remote-tracking branch\".\n>\n> Signed-off-by: Danny Lin <danny0838@gmail.com>\n> ---\n\nThanks.\n\nThe patch is whitespace damaged and does not apply, though.  I\nmanually typed the same change and commited with a tweaked log\nmessage, so no need to resend this one, but for future reference,\nplease try sending a patch to yourself and make sure it applies\ncleanly (and if it doesn't, figure out where tabs are eaten and\nlines are wrapped and fix that problem before sending the patch to\nthe list).\n\n\n>  builtin/branch.c | 6 +++---\n>  1 file changed, 3 insertions(+), 3 deletions(-)\n>\n> diff --git a/builtin/branch.c b/builtin/branch.c\n> index dc6f0b2..3560c51 100644\n> --- a/builtin/branch.c\n> +++ b/builtin/branch.c\n> @@ -242,7 +242,7 @@ static int delete_branches(int argc, const char\n> **argv, int force, int kinds,\n>                          sha1, &flags);\n>          if (!target) {\n>              error(remote_branch\n> -                  ? _(\"remote branch '%s' not found.\")\n> +                  ? _(\"remote-tracking branch '%s' not found.\")\n>                    : _(\"branch '%s' not found.\"), bname.buf);\n>              ret = 1;\n>              continue;\n> @@ -257,7 +257,7 @@ static int delete_branches(int argc, const char\n> **argv, int force, int kinds,\n>\n>          if (delete_ref(name, sha1, REF_NODEREF)) {\n>              error(remote_branch\n> -                  ? _(\"Error deleting remote branch '%s'\")\n> +                  ? _(\"Error deleting remote-tracking branch '%s'\")\n>                    : _(\"Error deleting branch '%s'\"),\n>                    bname.buf);\n>              ret = 1;\n> @@ -265,7 +265,7 @@ static int delete_branches(int argc, const char\n> **argv, int force, int kinds,\n>          }\n>          if (!quiet) {\n>              printf(remote_branch\n> -                   ? _(\"Deleted remote branch %s (was %s).\\n\")\n> +                   ? _(\"Deleted remote-tracking branch %s (was %s).\\n\")\n>                     : _(\"Deleted branch %s (was %s).\\n\"),\n>                     bname.buf,\n>                     (flags & REF_ISBROKEN) ? \"broken\"\n"}]}