{"thread":{"id":"60960","subject":"[PATCH] rebase: make warning less passive aggressive","startedAt":"2024-02-20T15:23:27Z","lastAt":"2024-02-22T17:00:13Z","messageCount":18,"participants":["Harmen Stoppels via GitGitGadget","Junio C Hamano","Patrick Steinhardt","Michal Suchánek","Jean-Noël AVILA","Kristoffer Haugsbakk"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"488989","messageId":"pull.1669.git.1708442603395.gitgitgadget@gmail.com","threadId":"60960","inReplyTo":null,"subject":"[PATCH] rebase: make warning less passive aggressive","fromName":"Harmen Stoppels via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2024-02-20T15:23:21Z","receivedAt":"2024-02-20T15:23:27Z","isPatch":true,"sender":{"key":"name:Harmen Stoppels","avatar":null},"body":"From: Harmen Stoppels <me@harmenstoppels.nl>\n\nWhen you run `git rebase --continue` when no rebase is in progress, git\noutputs `fatal: no rebase in progress?` which is not a question but a\nstatement. This commit makes it appear as a statement.\n\nSigned-off-by: Harmen Stoppels <me@harmenstoppels.nl>\n---\n    rebase: make warning less passive aggressive\n\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-1669%2Fhaampie%2Ffix%2Fpassive-agressive-message-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1669/haampie/fix/passive-agressive-message-v1\nPull-Request: https://github.com/gitgitgadget/git/pull/1669\n\n builtin/rebase.c | 2 +-\n po/bg.po         | 2 +-\n po/ca.po         | 2 +-\n po/de.po         | 2 +-\n po/el.po         | 2 +-\n po/es.po         | 2 +-\n po/fr.po         | 2 +-\n po/id.po         | 2 +-\n po/it.po         | 2 +-\n po/ko.po         | 2 +-\n po/pl.po         | 2 +-\n po/pt_PT.po      | 2 +-\n po/ru.po         | 2 +-\n po/sv.po         | 2 +-\n po/tr.po         | 2 +-\n po/uk.po         | 2 +-\n po/vi.po         | 2 +-\n po/zh_CN.po      | 2 +-\n po/zh_TW.po      | 2 +-\n 19 files changed, 19 insertions(+), 19 deletions(-)\n\ndiff --git a/builtin/rebase.c b/builtin/rebase.c\nindex 5b086f651a6..415783c4a21 100644\n--- a/builtin/rebase.c\n+++ b/builtin/rebase.c\n@@ -1254,7 +1254,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)\n \t\tdie(_(\"options '%s' and '%s' cannot be used together\"), \"--root\", \"--fork-point\");\n \n \tif (options.action != ACTION_NONE && !in_progress)\n-\t\tdie(_(\"No rebase in progress?\"));\n+\t\tdie(_(\"No rebase in progress\"));\n \n \tif (options.action == ACTION_EDIT_TODO && !is_merge(&options))\n \t\tdie(_(\"The --edit-todo action can only be used during \"\ndiff --git a/po/bg.po b/po/bg.po\nindex 6b95addef41..e54a2abf94a 100644\n--- a/po/bg.po\n+++ b/po/bg.po\n@@ -10782,7 +10782,7 @@ msgstr \"\"\n \"„preserve“.\\n\"\n \"Тази стойност вече не се поддържа, заменете я с „merges“.\"\n \n-msgid \"No rebase in progress?\"\n+msgid \"No rebase in progress\"\n msgstr \"Изглежда в момента не тече пребазиране\"\n \n msgid \"The --edit-todo action can only be used during interactive rebase.\"\ndiff --git a/po/ca.po b/po/ca.po\nindex bcb4da80fb9..2bcda556147 100644\n--- a/po/ca.po\n+++ b/po/ca.po\n@@ -10390,7 +10390,7 @@ msgstr \"\"\n \"Nota: la configuració «pull.rebase» també podria estar establerta a\\n\"\n \"+-«preserve», que ja no s'admet; utilitzeu «merge» en el seu lloc\"\n \n-msgid \"No rebase in progress?\"\n+msgid \"No rebase in progress\"\n msgstr \"No hi ha un «rebase» en curs?\"\n \n msgid \"The --edit-todo action can only be used during interactive rebase.\"\ndiff --git a/po/de.po b/po/de.po\nindex 37d6c809983..7ea1dd5b1a0 100644\n--- a/po/de.po\n+++ b/po/de.po\n@@ -10522,7 +10522,7 @@ msgstr \"\"\n \"'preserve' gesetzt, was nicht länger unterstützt wird; nutzen Sie\\n\"\n \"stattdessen 'merges'\"\n \n-msgid \"No rebase in progress?\"\n+msgid \"No rebase in progress\"\n msgstr \"Kein Rebase im Gange?\"\n \n msgid \"The --edit-todo action can only be used during interactive rebase.\"\ndiff --git a/po/el.po b/po/el.po\nindex 703f46d0c7c..d68d2542a4f 100644\n--- a/po/el.po\n+++ b/po/el.po\n@@ -15726,7 +15726,7 @@ msgid \"It looks like 'git am' is in progress. Cannot rebase.\"\n msgstr \"\"\n \n #: builtin/rebase.c:1208 git-legacy-rebase.sh:406\n-msgid \"No rebase in progress?\"\n+msgid \"No rebase in progress\"\n msgstr \"\"\n \n #: builtin/rebase.c:1212 git-legacy-rebase.sh:417\ndiff --git a/po/es.po b/po/es.po\nindex 1ff5ff3911d..55fb9e0c81d 100644\n--- a/po/es.po\n+++ b/po/es.po\n@@ -10109,7 +10109,7 @@ msgstr \"\"\n \"configurada a 'preserve', el cual ya no es soportado; usa 'merges' en\\n\"\n \"su lugar\"\n \n-msgid \"No rebase in progress?\"\n+msgid \"No rebase in progress\"\n msgstr \"¿No hay rebase en progreso?\"\n \n msgid \"The --edit-todo action can only be used during interactive rebase.\"\ndiff --git a/po/fr.po b/po/fr.po\nindex 736a90f6bb6..cae2b1dd12b 100644\n--- a/po/fr.po\n+++ b/po/fr.po\n@@ -10495,7 +10495,7 @@ msgstr \"\"\n \"Note : votre configuration `pull.rebase` peut aussi être 'preserve',\\n\"\n \"qui n'est plus géré ; utilisez 'merges' à la place\"\n \n-msgid \"No rebase in progress?\"\n+msgid \"No rebase in progress\"\n msgstr \"Pas de rebasage en cours ?\"\n \n msgid \"The --edit-todo action can only be used during interactive rebase.\"\ndiff --git a/po/id.po b/po/id.po\nindex 3e8b212b617..966ebb9a269 100644\n--- a/po/id.po\n+++ b/po/id.po\n@@ -12843,7 +12843,7 @@ msgstr \"\"\n \"yang tidak lagi didukung; gunakan 'merges' sebagai gantinya\"\n \n #: builtin/rebase.c\n-msgid \"No rebase in progress?\"\n+msgid \"No rebase in progress\"\n msgstr \"Tidak ada pendasaran ulang yang sedang berjalan?\"\n \n #: builtin/rebase.c\ndiff --git a/po/it.po b/po/it.po\nindex c31560834d8..1b1ca2d2990 100644\n--- a/po/it.po\n+++ b/po/it.po\n@@ -19666,7 +19666,7 @@ msgid \"cannot combine '--root' with '--fork-point'\"\n msgstr \"impossibile combinare '--root' con '--fork-point'\"\n \n #: builtin/rebase.c:1495\n-msgid \"No rebase in progress?\"\n+msgid \"No rebase in progress\"\n msgstr \"Nessun rebase in corso?\"\n \n #: builtin/rebase.c:1499\ndiff --git a/po/ko.po b/po/ko.po\nindex 5d190e52380..783d5c5e8ad 100644\n--- a/po/ko.po\n+++ b/po/ko.po\n@@ -16245,7 +16245,7 @@ msgid \"It looks like 'git am' is in progress. Cannot rebase.\"\n msgstr \"'git am'이 진행 중인 것처럼 보입니다. 리베이스할 수 없습니다.\"\n \n #: git-rebase.sh:403\n-msgid \"No rebase in progress?\"\n+msgid \"No rebase in progress\"\n msgstr \"리베이스가 진행 중이지 않습니다\"\n \n #: git-rebase.sh:414\ndiff --git a/po/pl.po b/po/pl.po\nindex 0ec127e14cc..5f361d558ba 100644\n--- a/po/pl.po\n+++ b/po/pl.po\n@@ -20449,7 +20449,7 @@ msgid \"cannot combine '--root' with '--fork-point'\"\n msgstr \"„--root” i „--fork-point” się wykluczają\"\n \n #: builtin/rebase.c:1202\n-msgid \"No rebase in progress?\"\n+msgid \"No rebase in progress\"\n msgstr \"Nie trwa żadne przestawianie?\"\n \n #: builtin/rebase.c:1206\ndiff --git a/po/pt_PT.po b/po/pt_PT.po\nindex 32142531bbd..6adae673fd3 100644\n--- a/po/pt_PT.po\n+++ b/po/pt_PT.po\n@@ -20608,7 +20608,7 @@ msgid \"--preserve-merges was replaced by --rebase-merges\"\n msgstr \"\"\n \n #: builtin/rebase.c:1230\n-msgid \"No rebase in progress?\"\n+msgid \"No rebase in progress\"\n msgstr \"Algum rebase em curso?\"\n \n #: builtin/rebase.c:1234\ndiff --git a/po/ru.po b/po/ru.po\nindex 3e56eb546ea..ebcd6dded70 100644\n--- a/po/ru.po\n+++ b/po/ru.po\n@@ -9986,7 +9986,7 @@ msgid \"\"\n \"which is no longer supported; use 'merges' instead\"\n msgstr \"\"\n \n-msgid \"No rebase in progress?\"\n+msgid \"No rebase in progress\"\n msgstr \"Нет перемещения в процессе?\"\n \n msgid \"The --edit-todo action can only be used during interactive rebase.\"\ndiff --git a/po/sv.po b/po/sv.po\nindex 786c2f749e7..d11bd0fc59c 100644\n--- a/po/sv.po\n+++ b/po/sv.po\n@@ -10153,7 +10153,7 @@ msgstr \"\"\n \"Observera: Din inställning för ”pull.rebase” kan också vara satt till\\n\"\n \"”preserve”, som inte längre stöds; använd ”merges” istället\"\n \n-msgid \"No rebase in progress?\"\n+msgid \"No rebase in progress\"\n msgstr \"Ingen ombasering pågår?\"\n \n msgid \"The --edit-todo action can only be used during interactive rebase.\"\ndiff --git a/po/tr.po b/po/tr.po\nindex 19d6661bbe6..d568956c686 100644\n--- a/po/tr.po\n+++ b/po/tr.po\n@@ -10278,7 +10278,7 @@ msgstr \"\"\n \"Not: `pull.rebase` yapılandırmanız, artık desteklenmeyen'\\n\"\n \"'preserve' olarak ayarlı olabilir; yerine 'merges' kullanın\"\n \n-msgid \"No rebase in progress?\"\n+msgid \"No rebase in progress\"\n msgstr \"Sürmekte olan bir yeniden temellendirme yok\"\n \n msgid \"The --edit-todo action can only be used during interactive rebase.\"\ndiff --git a/po/uk.po b/po/uk.po\nindex 0507e387bab..cd09d641817 100644\n--- a/po/uk.po\n+++ b/po/uk.po\n@@ -10341,7 +10341,7 @@ msgstr \"\"\n \"значення \\\"preserve\\\",\\n\"\n \"який більше не підтримується; натомість використовуйте \\\"merges\\\"\"\n \n-msgid \"No rebase in progress?\"\n+msgid \"No rebase in progress\"\n msgstr \"Перебазування не відбувається?\"\n \n msgid \"The --edit-todo action can only be used during interactive rebase.\"\ndiff --git a/po/vi.po b/po/vi.po\nindex d673745ac5b..869fb735c83 100644\n--- a/po/vi.po\n+++ b/po/vi.po\n@@ -9963,7 +9963,7 @@ msgstr \"\"\n \"'preserve',\\n\"\n \"cái mà giờ không còn được hỗ trợ nữa; dùng 'merges' để thay thế\"\n \n-msgid \"No rebase in progress?\"\n+msgid \"No rebase in progress\"\n msgstr \"Không có tiến trình rebase nào phải không?\"\n \n msgid \"The --edit-todo action can only be used during interactive rebase.\"\ndiff --git a/po/zh_CN.po b/po/zh_CN.po\nindex 39efaf1012a..60ca9ffb2cb 100644\n--- a/po/zh_CN.po\n+++ b/po/zh_CN.po\n@@ -12723,7 +12723,7 @@ msgstr \"\"\n \"取而代之请使用 'merges'\"\n \n #: builtin/rebase.c\n-msgid \"No rebase in progress?\"\n+msgid \"No rebase in progress\"\n msgstr \"没有正在进行的变基？\"\n \n #: builtin/rebase.c\ndiff --git a/po/zh_TW.po b/po/zh_TW.po\nindex 312dd128a41..5794e3f36fc 100644\n--- a/po/zh_TW.po\n+++ b/po/zh_TW.po\n@@ -12603,7 +12603,7 @@ msgstr \"\"\n \"請改用 “merges”\"\n \n #: builtin/rebase.c\n-msgid \"No rebase in progress?\"\n+msgid \"No rebase in progress\"\n msgstr \"沒有正在進行的重定基底？\"\n \n #: builtin/rebase.c\n\nbase-commit: 96c8a0712e569dd2812bf4fb5e72113caf326500\n-- \ngitgitgadget\n"},{"id":"488997","messageId":"xmqqv86jqc2e.fsf@gitster.g","threadId":"60960","inReplyTo":"pull.1669.git.1708442603395.gitgitgadget@gmail.com","subject":"Re: [PATCH] rebase: make warning less passive aggressive","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2024-02-20T17:29:13Z","receivedAt":"2024-02-20T17:29:18Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Harmen Stoppels via GitGitGadget\" <gitgitgadget@gmail.com> writes:\n\n> From: Harmen Stoppels <me@harmenstoppels.nl>\n>\n> When you run `git rebase --continue` when no rebase is in progress, git\n> outputs `fatal: no rebase in progress?` which is not a question but a\n> statement. This commit makes it appear as a statement.\n\n\"This commit makes it appear\" -> \"Make it appear\" (see\nSubmittingPatches).\n\n>  builtin/rebase.c | 2 +-\n\nThis change is very good, but a commit that touches code should not\ntouch po/ localizations in this project.  They are updated to match\nthe code change by respective language teams.\n\n>  po/bg.po         | 2 +-\n>  po/ca.po         | 2 +-\n>  po/de.po         | 2 +-\n>  po/el.po         | 2 +-\n>  po/es.po         | 2 +-\n>  po/fr.po         | 2 +-\n>  po/id.po         | 2 +-\n>  po/it.po         | 2 +-\n>  po/ko.po         | 2 +-\n>  po/pl.po         | 2 +-\n>  po/pt_PT.po      | 2 +-\n>  po/ru.po         | 2 +-\n>  po/sv.po         | 2 +-\n>  po/tr.po         | 2 +-\n>  po/uk.po         | 2 +-\n>  po/vi.po         | 2 +-\n>  po/zh_CN.po      | 2 +-\n>  po/zh_TW.po      | 2 +-\n>  19 files changed, 19 insertions(+), 19 deletions(-)\n>\n> diff --git a/builtin/rebase.c b/builtin/rebase.c\n> index 5b086f651a6..415783c4a21 100644\n> --- a/builtin/rebase.c\n> +++ b/builtin/rebase.c\n> @@ -1254,7 +1254,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)\n>  \t\tdie(_(\"options '%s' and '%s' cannot be used together\"), \"--root\", \"--fork-point\");\n>  \n>  \tif (options.action != ACTION_NONE && !in_progress)\n> -\t\tdie(_(\"No rebase in progress?\"));\n> +\t\tdie(_(\"No rebase in progress\"));\n>  \n>  \tif (options.action == ACTION_EDIT_TODO && !is_merge(&options))\n>  \t\tdie(_(\"The --edit-todo action can only be used during \"\n\nInterestingly this change does not break any test in t/ directory,\nwhich means we have a gap in test coverage.  It should not be any\npart of this patch, but we may want to add a test to exercise this\ncodepath (#leftoverbits).\n\nThanks.\n"},{"id":"489052","messageId":"ZdWiyYhKAB3_P6_k@tanuki","threadId":"60960","inReplyTo":"pull.1669.git.1708442603395.gitgitgadget@gmail.com","subject":"Re: [PATCH] rebase: make warning less passive aggressive","fromName":"Patrick Steinhardt","fromEmail":"ps@pks.im","sentAt":"2024-02-21T07:14:17Z","receivedAt":"2024-02-21T07:14:22Z","isPatch":true,"sender":{"key":"ps@pks.im","avatar":"https://avatars.githubusercontent.com/u/4056630?v=4"},"body":"On Tue, Feb 20, 2024 at 03:23:21PM +0000, Harmen Stoppels via GitGitGadget wrote:\n> From: Harmen Stoppels <me@harmenstoppels.nl>\n> \n> When you run `git rebase --continue` when no rebase is in progress, git\n> outputs `fatal: no rebase in progress?` which is not a question but a\n> statement. This commit makes it appear as a statement.\n> \n> Signed-off-by: Harmen Stoppels <me@harmenstoppels.nl>\n> ---\n>     rebase: make warning less passive aggressive\n> \n> Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1669%2Fhaampie%2Ffix%2Fpassive-agressive-message-v1\n> Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1669/haampie/fix/passive-agressive-message-v1\n> Pull-Request: https://github.com/gitgitgadget/git/pull/1669\n> \n>  builtin/rebase.c | 2 +-\n>  po/bg.po         | 2 +-\n>  po/ca.po         | 2 +-\n>  po/de.po         | 2 +-\n>  po/el.po         | 2 +-\n>  po/es.po         | 2 +-\n>  po/fr.po         | 2 +-\n>  po/id.po         | 2 +-\n>  po/it.po         | 2 +-\n>  po/ko.po         | 2 +-\n>  po/pl.po         | 2 +-\n>  po/pt_PT.po      | 2 +-\n>  po/ru.po         | 2 +-\n>  po/sv.po         | 2 +-\n>  po/tr.po         | 2 +-\n>  po/uk.po         | 2 +-\n>  po/vi.po         | 2 +-\n>  po/zh_CN.po      | 2 +-\n>  po/zh_TW.po      | 2 +-\n>  19 files changed, 19 insertions(+), 19 deletions(-)\n> \n> diff --git a/builtin/rebase.c b/builtin/rebase.c\n> index 5b086f651a6..415783c4a21 100644\n> --- a/builtin/rebase.c\n> +++ b/builtin/rebase.c\n> @@ -1254,7 +1254,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)\n>  \t\tdie(_(\"options '%s' and '%s' cannot be used together\"), \"--root\", \"--fork-point\");\n>  \n>  \tif (options.action != ACTION_NONE && !in_progress)\n> -\t\tdie(_(\"No rebase in progress?\"));\n> +\t\tdie(_(\"No rebase in progress\"));\n\nWhile we're at it changing this message, do we also want to convert it\nto start with a lower-case letter so that it aligns with our error\nmessage style?\n\nPatrick\n"},{"id":"489092","messageId":"xmqq8r3dpvun.fsf@gitster.g","threadId":"60960","inReplyTo":"ZdWiyYhKAB3_P6_k@tanuki","subject":"Re: [PATCH] rebase: make warning less passive aggressive","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2024-02-21T17:31:44Z","receivedAt":"2024-02-21T17:31:47Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Patrick Steinhardt <ps@pks.im> writes:\n\n>>  \tif (options.action != ACTION_NONE && !in_progress)\n>> -\t\tdie(_(\"No rebase in progress?\"));\n>> +\t\tdie(_(\"No rebase in progress\"));\n>\n> While we're at it changing this message, do we also want to convert it\n> to start with a lower-case letter so that it aligns with our error\n> message style?\n\nGood eyes.  Thanks for a good suggestion.\n"},{"id":"489094","messageId":"pull.1669.v2.git.1708537097448.gitgitgadget@gmail.com","threadId":"60960","inReplyTo":"pull.1669.git.1708442603395.gitgitgadget@gmail.com","subject":"[PATCH v2] rebase: make warning less passive aggressive","fromName":"Harmen Stoppels via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2024-02-21T17:38:17Z","receivedAt":"2024-02-21T17:38:22Z","isPatch":true,"sender":{"key":"name:Harmen Stoppels","avatar":null},"body":"From: Harmen Stoppels <me@harmenstoppels.nl>\n\nWhen you run `git rebase --continue` when no rebase is in progress, git\noutputs `fatal: No rebase in progress?` which is not a question but a\nstatement. Make it appear as a statement, and use lowercase to align\nwith error message style.\n\nSigned-off-by: Harmen Stoppels <me@harmenstoppels.nl>\n---\n    rebase: make warning less passive aggressive\n    \n    cc: Patrick Steinhardt ps@pks.im\n\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-1669%2Fhaampie%2Ffix%2Fpassive-agressive-message-v2\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1669/haampie/fix/passive-agressive-message-v2\nPull-Request: https://github.com/gitgitgadget/git/pull/1669\n\nRange-diff vs v1:\n\n 1:  4dfc578da84 < -:  ----------- rebase: make warning less passive aggressive\n -:  ----------- > 1:  a6f7a3a2477 rebase: make warning less passive aggressive\n\n\n builtin/rebase.c | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/builtin/rebase.c b/builtin/rebase.c\nindex 5b086f651a6..6ead9465a42 100644\n--- a/builtin/rebase.c\n+++ b/builtin/rebase.c\n@@ -1254,7 +1254,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)\n \t\tdie(_(\"options '%s' and '%s' cannot be used together\"), \"--root\", \"--fork-point\");\n \n \tif (options.action != ACTION_NONE && !in_progress)\n-\t\tdie(_(\"No rebase in progress?\"));\n+\t\tdie(_(\"no rebase in progress\"));\n \n \tif (options.action == ACTION_EDIT_TODO && !is_merge(&options))\n \t\tdie(_(\"The --edit-todo action can only be used during \"\n\nbase-commit: 96c8a0712e569dd2812bf4fb5e72113caf326500\n-- \ngitgitgadget\n"},{"id":"489095","messageId":"20240221173822.GA9696@kitsune.suse.cz","threadId":"60960","inReplyTo":"xmqqv86jqc2e.fsf@gitster.g","subject":"Re: [PATCH] rebase: make warning less passive aggressive","fromName":"Michal Suchánek","fromEmail":"msuchanek@suse.de","sentAt":"2024-02-21T17:38:22Z","receivedAt":"2024-02-21T17:38:25Z","isPatch":true,"sender":{"key":"msuchanek@suse.de","avatar":"https://avatars.githubusercontent.com/u/787652?v=4"},"body":"On Tue, Feb 20, 2024 at 09:29:13AM -0800, Junio C Hamano wrote:\n> \"Harmen Stoppels via GitGitGadget\" <gitgitgadget@gmail.com> writes:\n> \n> > From: Harmen Stoppels <me@harmenstoppels.nl>\n> >\n> > When you run `git rebase --continue` when no rebase is in progress, git\n> > outputs `fatal: no rebase in progress?` which is not a question but a\n> > statement. This commit makes it appear as a statement.\n> \n> \"This commit makes it appear\" -> \"Make it appear\" (see\n> SubmittingPatches).\n> \n> >  builtin/rebase.c | 2 +-\n> \n> This change is very good, but a commit that touches code should not\n> touch po/ localizations in this project.  They are updated to match\n> the code change by respective language teams.\n\nOr if it does touch the po files it could as well update the\ntranslations.\n\nThere are changes that can be trivially translated without any knowledge\nof the target language.\n\nThanks\n\nMichal\n"},{"id":"489099","messageId":"xmqqr0h5og57.fsf@gitster.g","threadId":"60960","inReplyTo":"20240221173822.GA9696@kitsune.suse.cz","subject":"Re: [PATCH] rebase: make warning less passive aggressive","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2024-02-21T17:56:20Z","receivedAt":"2024-02-21T17:56:25Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Michal Suchánek <msuchanek@suse.de> writes:\n\n> Or if it does touch the po files it could as well update the\n> translations.\n>\n> There are changes that can be trivially translated without any knowledge\n> of the target language.\n\nYou need to know the target language before deciding it is OK and\nsufficient to just remove ̉¿? from around a sentence to make it from\na question to a statement of a fact.  You may know enough, but\nreviewers may not be.  In addition, it would allow bypassing the\nlanguage teams, which is the most serious problem I see in such an\nattitude.\n"},{"id":"489100","messageId":"xmqqjzmxofvn.fsf@gitster.g","threadId":"60960","inReplyTo":"xmqqr0h5og57.fsf@gitster.g","subject":"Re: [PATCH] rebase: make warning less passive aggressive","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2024-02-21T18:02:04Z","receivedAt":"2024-02-21T18:02:09Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Junio C Hamano <gitster@pobox.com> writes:\n\n> Michal Suchánek <msuchanek@suse.de> writes:\n>\n>> Or if it does touch the po files it could as well update the\n>> translations.\n>>\n>> There are changes that can be trivially translated without any knowledge\n>> of the target language.\n>\n> You need to know the target language before deciding it is OK and\n> sufficient to just remove ̉¿? from around a sentence to make it from\n> a question to a statement of a fact.  You may know enough, but\n> reviewers may not be.  In addition, it would allow bypassing the\n> language teams, which is the most serious problem I see in such an\n> attitude.\n\nOops, \"attitude\" -> \"approach\".\n"},{"id":"489104","messageId":"20240221183018.GB9696@kitsune.suse.cz","threadId":"60960","inReplyTo":"xmqqjzmxofvn.fsf@gitster.g","subject":"Re: [PATCH] rebase: make warning less passive aggressive","fromName":"Michal Suchánek","fromEmail":"msuchanek@suse.de","sentAt":"2024-02-21T18:30:18Z","receivedAt":"2024-02-21T18:30:20Z","isPatch":true,"sender":{"key":"msuchanek@suse.de","avatar":"https://avatars.githubusercontent.com/u/787652?v=4"},"body":"On Wed, Feb 21, 2024 at 10:02:04AM -0800, Junio C Hamano wrote:\n> Junio C Hamano <gitster@pobox.com> writes:\n> \n> > Michal Suchánek <msuchanek@suse.de> writes:\n> >\n> >> Or if it does touch the po files it could as well update the\n> >> translations.\n> >>\n> >> There are changes that can be trivially translated without any knowledge\n> >> of the target language.\n> >\n> > You need to know the target language before deciding it is OK and\n> > sufficient to just remove ̉¿? from around a sentence to make it from\n> > a question to a statement of a fact.  You may know enough, but\n> > reviewers may not be.  In addition, it would allow bypassing the\n> > language teams, which is the most serious problem I see in such an\n> > attitude.\n> \n> Oops, \"attitude\" -> \"approach\".\n\nThat's certainly true that even if you know how to remove a question\nmark you may not find a reviewer who knows how to remove one.\n\nNonetheless, if you do find both a patch author and a reviewer that know\nhow to remove a question mark what is the problem with not involving\nseveral language teams to remove a question mark?\n\nThanks\n\nMichal\n"},{"id":"489110","messageId":"2324063.ElGaqSPkdT@cayenne","threadId":"60960","inReplyTo":"20240221183018.GB9696@kitsune.suse.cz","subject":"Re: [PATCH] rebase: make warning less passive aggressive","fromName":"Jean-Noël AVILA","fromEmail":"jn.avila@free.fr","sentAt":"2024-02-21T22:05:56Z","receivedAt":"2024-02-21T22:06:03Z","isPatch":true,"sender":{"key":"jn.avila@free.fr","avatar":"https://avatars.githubusercontent.com/u/156172?v=4"},"body":"On Wednesday, 21 February 2024 19:30:18 CET Michal Suchánek wrote:\n> On Wed, Feb 21, 2024 at 10:02:04AM -0800, Junio C Hamano wrote:\n> > Junio C Hamano <gitster@pobox.com> writes:\n> > \n> > > Michal Suchánek <msuchanek@suse.de> writes:\n> > >\n> > >> Or if it does touch the po files it could as well update the\n> > >> translations.\n> > >>\n> > >> There are changes that can be trivially translated without any \nknowledge\n> > >> of the target language.\n> > >\n> > > You need to know the target language before deciding it is OK and\n> > > sufficient to just remove ̉¿? from around a sentence to make it from\n> > > a question to a statement of a fact.  You may know enough, but\n> > > reviewers may not be.  In addition, it would allow bypassing the\n> > > language teams, which is the most serious problem I see in such an\n> > > attitude.\n> > \n> > Oops, \"attitude\" -> \"approach\".\n> \n> That's certainly true that even if you know how to remove a question\n> mark you may not find a reviewer who knows how to remove one.\n> \n> Nonetheless, if you do find both a patch author and a reviewer that know\n> how to remove a question mark what is the problem with not involving\n> several language teams to remove a question mark?\n> \n> Thanks\n> \n> Michal\n> \n> \n\nAs a translator, I'm less bothered by editing a sentence to remove a question \nmark (maybe enforcing a language style and reformulating the sentence by the \nway), than by translating again and again similar sentences.\n\nThanks\n\nJN\n\n\n\n"},{"id":"489113","messageId":"xmqq4je1mo5p.fsf@gitster.g","threadId":"60960","inReplyTo":"2324063.ElGaqSPkdT@cayenne","subject":"Re: [PATCH] rebase: make warning less passive aggressive","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2024-02-21T22:46:10Z","receivedAt":"2024-02-21T22:46:15Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jean-Noël AVILA <jn.avila@free.fr> writes:\n\n> As a translator, I'm less bothered by editing a sentence to remove a question \n> mark (maybe enforcing a language style and reformulating the sentence by the \n> way), than by translating again and again similar sentences.\n\nSure, but if the original in C locale used to be \"FOO BAR?\" and you\ntranslated it to \"foo bar?\" in your language, and then a patch\nupdates the string in the source to \"FOO BAR\", doesn't msgmerge\nnotice that the original as a \"fuzzy\" matching and offer you\nsomething like\n\n    # fuzzy\n    msgid \"FOO BAR\"\n    msgstr \"foo bar?\"\n\nso that all you have to do is to remove '?' anyway?  So I do not\nthink you'd need to translate the \"FOO BAR\" part again and again.\n\nBut the above assumes that for your language, the ONLY thing to turn\nsuch a rhetorical \"passive aggressive\" question into grammatically\ncorrect statement of a fact is to remove the question mark.  It may\nnot be universally true for all languages, and for some language,\neven after msgmerge did its job correctly, you may need to do more\nthan just removing the question mark to adjust the remaining \"foo\nbar\" part.\n\n"},{"id":"489118","messageId":"xmqqr0h5i89i.fsf@gitster.g","threadId":"60960","inReplyTo":"xmqq4je1mo5p.fsf@gitster.g","subject":"Re: [PATCH] rebase: make warning less passive aggressive","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2024-02-22T01:43:05Z","receivedAt":"2024-02-22T01:43:16Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Junio C Hamano <gitster@pobox.com> writes:\n\n> Jean-Noël AVILA <jn.avila@free.fr> writes:\n>\n>> As a translator, I'm less bothered by editing a sentence to remove a question \n>> mark (maybe enforcing a language style and reformulating the sentence by the \n>> way), than by translating again and again similar sentences.\n>\n> Sure, but if the original in C locale used to be \"FOO BAR?\" and you\n> translated it to \"foo bar?\" in your language, and then a patch\n> updates the string in the source to \"FOO BAR\", doesn't msgmerge\n> notice that the original as a \"fuzzy\" matching and offer you\n> something like\n>\n>     #, fuzzy\n>     msgid \"FOO BAR\"\n>     msgstr \"foo bar?\"\n>\n> so that all you have to do is to remove '?' anyway?  So I do not\n> think you'd need to translate the \"FOO BAR\" part again and again.\n>\n> But the above assumes that for your language, the ONLY thing to turn\n> such a rhetorical \"passive aggressive\" question into grammatically\n> correct statement of a fact is to remove the question mark.  It may\n> not be universally true for all languages, and for some language,\n> even after msgmerge did its job correctly, you may need to do more\n> than just removing the question mark to adjust the remaining \"foo\n> bar\" part.\n\nHopefully the last message on this topic from me.  I just tried this:\n\n * apply v2 of \"No rebase in progress?\" -> \"no rebase in progress\"\n   patch from Harmen.  This only changed _(\"\") string, without\n   touching any po/* files.\n\n * follow po/README.md and pretend as if I were a po/es.po team\n   member, which involved running the command:\n\n\t$ make po-update PO_FILE=po/es.po\n\n * view the resulting po/es.po, which will be the starting point of\n   a new translation.\n\n        $ git diff po/es.po\n\nThe last one showed me this snippet:\n\n    -msgid \"No rebase in progress?\"\n    +#: builtin/rebase.c:1257\n    +#, fuzzy\n    +msgid \"no rebase in progress\"\n     msgstr \"¿No hay rebase en progreso?\"\n\nThe \"#, fuzzy\" thing is a signal that an old msgid has been updated\nand corresponding msgstr may need to be updated.\n\nThe primary problem I had with Harmen's v1 was that it touched po/\nfile in the first place (which was corrected in v2), but the updates\nto po files it did looked like so:\n\n    -msgid \"No rebase in progress?\"\n    +msgid \"No rebase in progress\"\n     msgstr \"¿No hay rebase en progreso?\"\n\nNotice the lack of \"#, fuzzy\" marking?  If v1 were accepted with\nthese changes, then the \"po-update\" step I showed earlier would have\nproduced something like this instead:\n\n    +#: builtin/rebase.c:1257\n     msgid \"no rebase in progress\"\n     msgstr \"¿No hay rebase en progreso?\"\n\nAs msgid alone was updated already, the \"po-update\" step has no idea\nthat the translated msgstr is out of date.  We do not get the\nhelpful \"#, fuzzy\" comment to tell the translator which msgstr is\nout of date and needs attention.\n\nSo it is another reason why we want the developers to concentrate\nonly on writing good C-locale messages inside _(\"\") and N_(\"\"),\nwithout touching po/ directory at all.  It would avoid making\nchanges that can confuse toolchain l10n people rely on (like the\npresence of \"fuzzy\" comments).\n"},{"id":"489122","messageId":"ZdcCr2SAFJRgjhYD@tanuki","threadId":"60960","inReplyTo":"pull.1669.v2.git.1708537097448.gitgitgadget@gmail.com","subject":"Re: [PATCH v2] rebase: make warning less passive aggressive","fromName":"Patrick Steinhardt","fromEmail":"ps@pks.im","sentAt":"2024-02-22T08:15:43Z","receivedAt":"2024-02-22T08:15:49Z","isPatch":true,"sender":{"key":"ps@pks.im","avatar":"https://avatars.githubusercontent.com/u/4056630?v=4"},"body":"On Wed, Feb 21, 2024 at 05:38:17PM +0000, Harmen Stoppels via GitGitGadget wrote:\n> From: Harmen Stoppels <me@harmenstoppels.nl>\n> \n> When you run `git rebase --continue` when no rebase is in progress, git\n> outputs `fatal: No rebase in progress?` which is not a question but a\n> statement. Make it appear as a statement, and use lowercase to align\n> with error message style.\n> \n> Signed-off-by: Harmen Stoppels <me@harmenstoppels.nl>\n\nGot nothing else to add, this looks good to me. Thanks!\n\nPatrick\n\n> ---\n>     rebase: make warning less passive aggressive\n>     \n>     cc: Patrick Steinhardt ps@pks.im\n> \n> Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1669%2Fhaampie%2Ffix%2Fpassive-agressive-message-v2\n> Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1669/haampie/fix/passive-agressive-message-v2\n> Pull-Request: https://github.com/gitgitgadget/git/pull/1669\n> \n> Range-diff vs v1:\n> \n>  1:  4dfc578da84 < -:  ----------- rebase: make warning less passive aggressive\n>  -:  ----------- > 1:  a6f7a3a2477 rebase: make warning less passive aggressive\n> \n> \n>  builtin/rebase.c | 2 +-\n>  1 file changed, 1 insertion(+), 1 deletion(-)\n> \n> diff --git a/builtin/rebase.c b/builtin/rebase.c\n> index 5b086f651a6..6ead9465a42 100644\n> --- a/builtin/rebase.c\n> +++ b/builtin/rebase.c\n> @@ -1254,7 +1254,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)\n>  \t\tdie(_(\"options '%s' and '%s' cannot be used together\"), \"--root\", \"--fork-point\");\n>  \n>  \tif (options.action != ACTION_NONE && !in_progress)\n> -\t\tdie(_(\"No rebase in progress?\"));\n> +\t\tdie(_(\"no rebase in progress\"));\n>  \n>  \tif (options.action == ACTION_EDIT_TODO && !is_merge(&options))\n>  \t\tdie(_(\"The --edit-todo action can only be used during \"\n> \n> base-commit: 96c8a0712e569dd2812bf4fb5e72113caf326500\n> -- \n> gitgitgadget\n> \n"},{"id":"489128","messageId":"7633780.EvYhyI6sBW@cayenne","threadId":"60960","inReplyTo":"xmqq4je1mo5p.fsf@gitster.g","subject":"Re: [PATCH] rebase: make warning less passive aggressive","fromName":"Jean-Noël AVILA","fromEmail":"jn.avila@free.fr","sentAt":"2024-02-22T10:01:59Z","receivedAt":"2024-02-22T10:02:05Z","isPatch":true,"sender":{"key":"jn.avila@free.fr","avatar":"https://avatars.githubusercontent.com/u/156172?v=4"},"body":"On Wednesday, 21 February 2024 23:46:10 CET Junio C Hamano wrote:\n> Jean-Noël AVILA <jn.avila@free.fr> writes:\n> \n> > As a translator, I'm less bothered by editing a sentence to remove a \nquestion \n> > mark (maybe enforcing a language style and reformulating the sentence by \nthe \n> > way), than by translating again and again similar sentences.\n> \n> Sure, but if the original in C locale used to be \"FOO BAR?\" and you\n> translated it to \"foo bar?\" in your language, and then a patch\n> updates the string in the source to \"FOO BAR\", doesn't msgmerge\n> notice that the original as a \"fuzzy\" matching and offer you\n> something like\n> \n>     # fuzzy\n>     msgid \"FOO BAR\"\n>     msgstr \"foo bar?\"\n> \n\n> so that all you have to do is to remove '?' anyway?\n\nYes, it works as expected.\n\n> So I do not\n> think you'd need to translate the \"FOO BAR\" part again and again.\n\nSorry for not being clear: I don't consider changing a question to an \nassertion is translating \"again and again\". This change is completely entitled \nto end up on translators desk, because it involves possibly changing the whole \nstructure of the sentence.\n\nAbout \"again and again\", I was more refering to strings such as \"could not \nstat '%s'\" and then \"could not stat file '%s'\".\n\n> \n> But the above assumes that for your language, the ONLY thing to turn\n> such a rhetorical \"passive aggressive\" question into grammatically\n> correct statement of a fact is to remove the question mark.  It may\n> not be universally true for all languages, and for some language,\n> even after msgmerge did its job correctly, you may need to do more\n> than just removing the question mark to adjust the remaining \"foo\n> bar\" part.\n> \n\nI perfectly agree with you.\n\nThanks\n\n\n\n\n"},{"id":"489129","messageId":"759cbb30-96dd-456a-baab-b9451d400dcb@app.fastmail.com","threadId":"60960","inReplyTo":"pull.1669.v2.git.1708537097448.gitgitgadget@gmail.com","subject":"Re: [PATCH v2] rebase: make warning less passive aggressive","fromName":"Kristoffer Haugsbakk","fromEmail":"code@khaugsbakk.name","sentAt":"2024-02-22T10:53:10Z","receivedAt":"2024-02-22T10:53:32Z","isPatch":true,"sender":{"key":"code@khaugsbakk.name","avatar":"https://avatars.githubusercontent.com/u/2229597?v=4"},"body":"On Wed, Feb 21, 2024, at 18:38, Harmen Stoppels via GitGitGadget wrote:\n> From: Harmen Stoppels <me@harmenstoppels.nl>\n>\n> When you run `git rebase --continue` when no rebase is in progress, git\n> outputs `fatal: No rebase in progress?` which is not a question but a\n> statement. Make it appear as a statement, and use lowercase to align\n> with error message style.\n>\n> Signed-off-by: Harmen Stoppels <me@harmenstoppels.nl>\n> ---\n\nI’ve interpreted this error as: I’m not quite sure but it looks like you\nare not in the middle of a rebase? Like it can’t be completely\nsure. Maybe from a more “primitive” time, implementation-wise?[1] :)\n\n(I waited to make this reply in order to see what others would say. And\napparently there is no need for a hedging/passive aggressive question\nmark.)\n\n† 1: 031321c654d (Add --continue and --abort options to git-rebase.,\n    2006-04-26)\n\n-- \nKristoffer Haugsbakk\n"},{"id":"489130","messageId":"20240222110416.GD9696@kitsune.suse.cz","threadId":"60960","inReplyTo":"7633780.EvYhyI6sBW@cayenne","subject":"Re: [PATCH] rebase: make warning less passive aggressive","fromName":"Michal Suchánek","fromEmail":"msuchanek@suse.de","sentAt":"2024-02-22T11:04:16Z","receivedAt":"2024-02-22T11:04:18Z","isPatch":true,"sender":{"key":"msuchanek@suse.de","avatar":"https://avatars.githubusercontent.com/u/787652?v=4"},"body":"Hello,\n\nOn Thu, Feb 22, 2024 at 11:01:59AM +0100, Jean-Noël AVILA wrote:\n> On Wednesday, 21 February 2024 23:46:10 CET Junio C Hamano wrote:\n> > Jean-Noël AVILA <jn.avila@free.fr> writes:\n> > \n> > > As a translator, I'm less bothered by editing a sentence to remove a \n> question \n> > > mark (maybe enforcing a language style and reformulating the sentence by \n> the \n> > > way), than by translating again and again similar sentences.\n\nIndeed, the style part is the key here.\n\nThe message that is changed here was quite stylistically poorly written\nwhich is why only removing the question mark is correct, and it's why\nit's changed in the first place, too.\n\nWhile this is faithfully reflected in multiple language translations\nthere is no saying that's the case for all languages, at least basic\nunderstanding of the grammar of the language in question is needed to\nverify that.\n\n> > But the above assumes that for your language, the ONLY thing to turn\n> > such a rhetorical \"passive aggressive\" question into grammatically\n> > correct statement of a fact is to remove the question mark.  It may\n> > not be universally true for all languages, and for some language,\n> > even after msgmerge did its job correctly, you may need to do more\n> > than just removing the question mark to adjust the remaining \"foo\n> > bar\" part.\n> > \n> \n> I perfectly agree with you.\n\nIndeed, and that's why per-language review for such change is needed.\n\nThanks\n\nMichal\n"},{"id":"489168","messageId":"xmqqil2gh2fp.fsf@gitster.g","threadId":"60960","inReplyTo":"7633780.EvYhyI6sBW@cayenne","subject":"Re: [PATCH] rebase: make warning less passive aggressive","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2024-02-22T16:46:34Z","receivedAt":"2024-02-22T16:46:45Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jean-Noël AVILA <jn.avila@free.fr> writes:\n\n> About \"again and again\", I was more refering to strings such as \"could not \n> stat '%s'\" and then \"could not stat file '%s'\".\n\nI completely agree with that.\n\nBut the message you responded was not about that kind of burden to\ntranslators.  It was arguing that it somehow is better to update the\nin-code _(\"string\") at the same time as updating msgid and msgstr in\nthe same patch (it may not have been directly \"arguing for\", but\nessentially doing so with a rhetorical question).\n\nSo your \"I do not want to translate again and again\" thrown into\nthat context utterly confused me.  I didn't quite see how the\n\"everything in one patch\" approach would help translaters by not\nhaving them translate \"again and again\".\n\nThanks for clearing my confusion.\n\n\n"},{"id":"489169","messageId":"xmqqcysoh1t3.fsf@gitster.g","threadId":"60960","inReplyTo":"759cbb30-96dd-456a-baab-b9451d400dcb@app.fastmail.com","subject":"Re: [PATCH v2] rebase: make warning less passive aggressive","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2024-02-22T17:00:08Z","receivedAt":"2024-02-22T17:00:13Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Kristoffer Haugsbakk\" <code@khaugsbakk.name> writes:\n\n> I’ve interpreted this error as: I’m not quite sure but it looks like you\n> are not in the middle of a rebase? Like it can’t be completely\n> sure. Maybe from a more “primitive” time, implementation-wise?[1] :)\n\nIt certainly is a good point.  At least one other message in the\nsame command is equally less assertive, e.g.\n\n\tdie(_(\"It looks like 'git am' is in progress. Cannot rebase.\"));\n\nIt may have been OK to be uncertain in the earlier times back when\nwe did not much know what we were doing, but by now we should be\nmore assertive, so that the end-users can more easily complain,\nsaying \"The command said I was not rebasing, but I was!  Here is\nwhat I did\", which would hopefully be a valuable feedback for\nimproving the logic to diagnose what state we are in.\n\nSo, making it clear that it is a statement of a fact, or at least we\nare telling the users what we _think_ the state is assertively, is a\ngood idea either way.\n\nThanks.\n"}]}