rebase: make warning less passive aggressive

From: Harmen Stoppels <[email protected]>

When you run git rebase --continue when no rebase is in progress, git outputs fatal: no rebase in progress? which is not a question but a statement. This commit makes it appear as a statement.

 builtin/rebase.c | 2 +-

 po/bg.po         | 2 +-
 po/ca.po         | 2 +-
 po/de.po         | 2 +-
 po/el.po         | 2 +-
 po/es.po         | 2 +-
 po/fr.po         | 2 +-
 po/id.po         | 2 +-
 po/it.po         | 2 +-
 po/ko.po         | 2 +-
 po/pl.po         | 2 +-
 po/pt_PT.po      | 2 +-
 po/ru.po         | 2 +-
 po/sv.po         | 2 +-
 po/tr.po         | 2 +-
 po/uk.po         | 2 +-
 po/vi.po         | 2 +-
 po/zh_CN.po      | 2 +-
 po/zh_TW.po      | 2 +-
 19 files changed, 19 insertions(+), 19 deletions(-)

builtin/rebase.c +0 -0

index 5b086f651a6..415783c4a21 100644

Quoted 5 lines · Harmen Stoppels via GitGitGadget

From: Harmen Stoppels <[email protected]>

When you run git rebase --continue when no rebase is in progress, git outputs fatal: no rebase in progress? which is not a question but a statement. This commit makes it appear as a statement.

"This commit makes it appear" -> "Make it appear" (see SubmittingPatches).

Quoted 1 line

 builtin/rebase.c | 2 +-

This change is very good, but a commit that touches code should not touch po/ localizations in this project. They are updated to match the code change by respective language teams.

Or if it does touch the po files it could as well update the translations.

There are changes that can be trivially translated without any knowledge of the target language.

Quoted 5 lines · Michal Suchánek

Or if it does touch the po files it could as well update the translations.

There are changes that can be trivially translated without any knowledge of the target language.

You need to know the target language before deciding it is OK and sufficient to just remove ̉¿? from around a sentence to make it from a question to a statement of a fact. You may know enough, but reviewers may not be. In addition, it would allow bypassing the language teams, which is the most serious problem I see in such an attitude.

Quoted 8 lines · Junio C Hamano

Quoted 5 lines · Michal Suchánek

Or if it does touch the po files it could as well update the translations.

There are changes that can be trivially translated without any knowledge of the target language.

Quoted 6 lines

You need to know the target language before deciding it is OK and sufficient to just remove ̉¿? from around a sentence to make it from a question to a statement of a fact. You may know enough, but reviewers may not be. In addition, it would allow bypassing the language teams, which is the most serious problem I see in such an attitude.

Oops, "attitude" -> "approach".

Quoted 8 lines · Junio C Hamano

Quoted 6 lines · Junio C Hamano

Quoted 4 lines · Michal Suchánek

Or if it does touch the po files it could as well update the translations.

There are changes that can be trivially translated without any

Quoted 10 lines

Quoted 8 lines

Quoted 1 line

of the target language.

You need to know the target language before deciding it is OK and sufficient to just remove ̉¿? from around a sentence to make it from a question to a statement of a fact. You may know enough, but reviewers may not be. In addition, it would allow bypassing the language teams, which is the most serious problem I see in such an attitude.

Oops, "attitude" -> "approach".

That's certainly true that even if you know how to remove a question mark you may not find a reviewer who knows how to remove one.

Nonetheless, if you do find both a patch author and a reviewer that know how to remove a question mark what is the problem with not involving several language teams to remove a question mark?

Thanks

Michal

As a translator, I'm less bothered by editing a sentence to remove a question mark (maybe enforcing a language style and reformulating the sentence by the way), than by translating again and again similar sentences.

Quoted 3 lines · Jean-Noël AVILA

As a translator, I'm less bothered by editing a sentence to remove a question mark (maybe enforcing a language style and reformulating the sentence by the way), than by translating again and again similar sentences.

Sure, but if the original in C locale used to be "FOO BAR?" and you translated it to "foo bar?" in your language, and then a patch updates the string in the source to "FOO BAR", doesn't msgmerge notice that the original as a "fuzzy" matching and offer you something like

#, fuzzy
msgid "FOO BAR"
msgstr "foo bar?"

so that all you have to do is to remove '?' anyway? So I do not think you'd need to translate the "FOO BAR" part again and again.

But the above assumes that for your language, the ONLY thing to turn such a rhetorical "passive aggressive" question into grammatically correct statement of a fact is to remove the question mark. It may not be universally true for all languages, and for some language, even after msgmerge did its job correctly, you may need to do more than just removing the question mark to adjust the remaining "foo bar" part.

Quoted 1 line · Jean-Noël AVILA

As a translator, I'm less bothered by editing a sentence to remove a

Quoted 1 line

mark (maybe enforcing a language style and reformulating the sentence by

Quoted 1 line

way), than by translating again and again similar sentences.

Sure, but if the original in C locale used to be "FOO BAR?" and you translated it to "foo bar?" in your language, and then a patch updates the string in the source to "FOO BAR", doesn't msgmerge notice that the original as a "fuzzy" matching and offer you something like

    # fuzzy
    msgid "FOO BAR"
    msgstr "foo bar?"

so that all you have to do is to remove '?' anyway?

So I do not
think you'd need to translate the "FOO BAR" part again and again.

But the above assumes that for your language, the ONLY thing to turn such a rhetorical "passive aggressive" question into grammatically correct statement of a fact is to remove the question mark. It may not be universally true for all languages, and for some language, even after msgmerge did its job correctly, you may need to do more than just removing the question mark to adjust the remaining "foo bar" part.

Quoted 3 lines · On Wednesday, 21 February 2024 23:46:10 CET Junio C Hamano wrote:

Quoted 1 line · Jean-Noël AVILA

As a translator, I'm less bothered by editing a sentence to remove a

question

Quoted 1 line

Quoted 1 line

mark (maybe enforcing a language style and reformulating the sentence by

the

Quoted 1 line

Quoted 1 line

way), than by translating again and again similar sentences.

Quoted 8 lines

But the above assumes that for your language, the ONLY thing to turn such a rhetorical "passive aggressive" question into grammatically correct statement of a fact is to remove the question mark. It may not be universally true for all languages, and for some language, even after msgmerge did its job correctly, you may need to do more than just removing the question mark to adjust the remaining "foo bar" part.

I perfectly agree with you.

About "again and again", I was more refering to strings such as "could not stat '%s'" and then "could not stat file '%s'".

From: Harmen Stoppels <[email protected]>

When you run git rebase --continue when no rebase is in progress, git outputs fatal: no rebase in progress? which is not a question but a statement. This commit makes it appear as a statement.

Signed-off-by Harmen Stoppels <[email protected]>

---
rebase: make warning less passive aggressive

Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1669%2Fhaampie%2Ffix%2Fpassive-agressive-message-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1669/haampie/fix/passive-agressive-message-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/1669

 builtin/rebase.c | 2 +-
 po/bg.po         | 2 +-
 po/ca.po         | 2 +-
 po/de.po         | 2 +-
 po/el.po         | 2 +-
 po/es.po         | 2 +-
 po/fr.po         | 2 +-
 po/id.po         | 2 +-
 po/it.po         | 2 +-
 po/ko.po         | 2 +-
 po/pl.po         | 2 +-
 po/pt_PT.po      | 2 +-
 po/ru.po         | 2 +-
 po/sv.po         | 2 +-
 po/tr.po         | 2 +-
 po/uk.po         | 2 +-
 po/vi.po         | 2 +-
 po/zh_CN.po      | 2 +-
 po/zh_TW.po      | 2 +-
 19 files changed, 19 insertions(+), 19 deletions(-)

builtin/rebase.c +0 -0

index 5b086f651a6..415783c4a21 100644

builtin/rebase.c int cmd_rebase(int argc, const char **argv, const char *prefix) · line 1257

Quoted 3 lines

builtin/rebase.c +1 -1

 	if (options.action != ACTION_NONE && !in_progress)
-		die(_("No rebase in progress?"));
+		die(_("No rebase in progress"));

While we're at it changing this message, do we also want to convert it to start with a lower-case letter so that it aligns with our error message style?

From: Harmen Stoppels <[email protected]>

When you run git rebase --continue when no rebase is in progress, git outputs fatal: No rebase in progress? which is not a question but a statement. Make it appear as a statement, and use lowercase to align with error message style.

Signed-off-by Harmen Stoppels <[email protected]>

---
rebase: make warning less passive aggressive

cc Patrick Steinhardt [email protected]

Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1669%2Fhaampie%2Ffix%2Fpassive-agressive-message-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1669/haampie/fix/passive-agressive-message-v2
Pull-Request: https://github.com/gitgitgadget/git/pull/1669

Range-diff vs v1:

 1:  4dfc578da84 < -:  ----------- rebase: make warning less passive aggressive
 -:  ----------- > 1:  a6f7a3a2477 rebase: make warning less passive aggressive

 builtin/rebase.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

builtin/rebase.c +1 -1

index 5b086f651a6..6ead9465a42 100644
@@ -1254,7 +1254,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 		die(_("options '%s' and '%s' cannot be used together"), "--root", "--fork-point");
 
 	if (options.action != ACTION_NONE && !in_progress)
-		die(_("No rebase in progress?"));
+		die(_("no rebase in progress"));
 
 	if (options.action == ACTION_EDIT_TODO && !is_merge(&options))
 		die(_("The --edit-todo action can only be used during "

base-commit: 96c8a0712e569dd2812bf4fb5e72113caf326500

Signature · 1 line

gitgitgadget

From: Harmen Stoppels <[email protected]>

When you run git rebase --continue when no rebase is in progress, git outputs fatal: No rebase in progress? which is not a question but a statement. Make it appear as a statement, and use lowercase to align with error message style.

Signed-off-by Harmen Stoppels <[email protected]>

---

I’ve interpreted this error as: I’m not quite sure but it looks like you are not in the middle of a rebase? Like it can’t be completely sure. Maybe from a more “primitive” time, implementation-wise?[1] :)