{"thread":{"id":"45995","subject":"[PATCH] rebase -i: Add missing newline to end of message","startedAt":"2017-05-18T13:42:26Z","lastAt":"2017-05-19T14:35:42Z","messageCount":8,"participants":["Phillip Wood","Ævar Arnfjörð Bjarmason","Johannes Schindelin","phillip.wood@talktalk.net"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"320158","messageId":"20170518134154.12771-1-phillip.wood@talktalk.net","threadId":"45995","inReplyTo":null,"subject":"[PATCH] rebase -i: Add missing newline to end of message","fromName":"Phillip Wood","fromEmail":"phillip.wood@talktalk.net","sentAt":"2017-05-18T13:41:54Z","receivedAt":"2017-05-18T13:42:26Z","isPatch":true,"sender":{"key":"phillip.wood@dunelm.org.uk","avatar":null},"body":"From: Phillip Wood \n\nThe message that's printed when auto-stashed changes are successfully\nrestored was missing '\\n' at the end.\n---\n sequencer.c | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/sequencer.c b/sequencer.c\nindex 311728a14..4dcf9c8be 100644\n--- a/sequencer.c\n+++ b/sequencer.c\n@@ -1920,7 +1920,7 @@ static int apply_autostash(struct replay_opts *opts)\n \targv_array_push(&child.args, \"apply\");\n \targv_array_push(&child.args, stash_sha1.buf);\n \tif (!run_command(&child))\n-\t\tprintf(_(\"Applied autostash.\"));\n+\t\tprintf(_(\"Applied autostash.\\n\"));\n \telse {\n \t\tstruct child_process store = CHILD_PROCESS_INIT;\n \n-- \n2.13.0\n\n"},{"id":"320159","messageId":"CACBZZX4hbe+bDbxQKy92ruD8=4V7pqnOi9WyBqhunG-F8=wXRw@mail.gmail.com","threadId":"45995","inReplyTo":"20170518134154.12771-1-phillip.wood@talktalk.net","subject":"Re: [PATCH] rebase -i: Add missing newline to end of message","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2017-05-18T13:48:07Z","receivedAt":"2017-05-18T13:48:34Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"On Thu, May 18, 2017 at 3:41 PM, Phillip Wood wrote:\n> From: Phillip Wood \n>\n> The message that's printed when auto-stashed changes are successfully\n> restored was missing '\\n' at the end.\n\nBoth this and your reflog message really seem like the sort of tricky\nedge cases we should have tests for.\n"},{"id":"320162","messageId":"3e4ad130-0932-f465-281d-20acfe3125a2@talktalk.net","threadId":"45995","inReplyTo":"CACBZZX4hbe+bDbxQKy92ruD8=4V7pqnOi9WyBqhunG-F8=wXRw@mail.gmail.com","subject":"Re: [PATCH] rebase -i: Add missing newline to end of message","fromName":"Phillip Wood","fromEmail":"phillip.wood@talktalk.net","sentAt":"2017-05-18T14:53:46Z","receivedAt":"2017-05-18T14:53:53Z","isPatch":true,"sender":{"key":"phillip.wood@dunelm.org.uk","avatar":null},"body":"On 18/05/17 14:48, Ævar Arnfjörð Bjarmason wrote:\n> On Thu, May 18, 2017 at 3:41 PM, Phillip Wood wrote:\n>> From: Phillip Wood \n>>\n>> The message that's printed when auto-stashed changes are successfully\n>> restored was missing '\\n' at the end.\n> \n> Both this and your reflog message really seem like the sort of tricky\n> edge cases we should have tests for.\n> \nYes I agree, I'll try and put something together when I have time\n\nBest Wishes\n\nPhillip\n"},{"id":"320212","messageId":"alpine.DEB.2.21.1.1705182321030.3610@virtualbox","threadId":"45995","inReplyTo":"20170518134154.12771-1-phillip.wood@talktalk.net","subject":"Re: [PATCH] rebase -i: Add missing newline to end of message","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2017-05-18T21:21:27Z","receivedAt":"2017-05-18T21:21:35Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Phillip,\n\nOn Thu, 18 May 2017, Phillip Wood wrote:\n\n> From: Phillip Wood \n> \n> The message that's printed when auto-stashed changes are successfully\n> restored was missing '\\n' at the end.\n> ---\n\nPlease add your Signed-off-by:, and my Acked-by:\n\nThanks,\nJohannes\n"},{"id":"320252","messageId":"406d017b-b138-72db-d5ad-14ccf5d1f3d4@talktalk.net","threadId":"45995","inReplyTo":"alpine.DEB.2.21.1.1705182321030.3610@virtualbox","subject":"Re: [PATCH] rebase -i: Add missing newline to end of message","fromName":"Phillip Wood","fromEmail":"phillip.wood@talktalk.net","sentAt":"2017-05-19T10:13:54Z","receivedAt":"2017-05-19T10:14:02Z","isPatch":true,"sender":{"key":"phillip.wood@dunelm.org.uk","avatar":null},"body":"On 18/05/17 22:21, Johannes Schindelin wrote:\n> Hi Phillip,\n> \n> On Thu, 18 May 2017, Phillip Wood wrote:\n> \n>> From: Phillip Wood \n>>\n>> The message that's printed when auto-stashed changes are successfully\n>> restored was missing '\\n' at the end.\n>> ---\n> \n> Please add your Signed-off-by:, and my Acked-by:\n\nWill do (I forgot to add --signoff to git commit). Do I need to resend\nthe other patches with your Acked-by: or will that happen when Junio\napplies them?\n\nI was thinking about this last night and wonder if it would be better to do\n\n-\t\tprintf(_(\"Applied autostash.\"));\n+\t\tprintf(\"%s\\n\", _(\"Applied autostash.\"));\n\nrather than\n\n-\t\tprintf(_(\"Applied autostash.\"));\n+\t\tprintf(_(\"Applied autostash.\\n\"));\n\nas it would avoid changing the translated string and also mean that the\nnewline couldn't be accidentally removed any typos in the translation.\n\nBest Wishes\n\nPhillip\n"},{"id":"320253","messageId":"CACBZZX5yyD-EA0obHKGGueUgf4xO9o=sBAsBOrrPipx3vNPmsA@mail.gmail.com","threadId":"45995","inReplyTo":"406d017b-b138-72db-d5ad-14ccf5d1f3d4@talktalk.net","subject":"Re: [PATCH] rebase -i: Add missing newline to end of message","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2017-05-19T11:24:46Z","receivedAt":"2017-05-19T11:25:13Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"On Fri, May 19, 2017 at 12:13 PM, Phillip Wood\n wrote:\n> On 18/05/17 22:21, Johannes Schindelin wrote:\n>> Hi Phillip,\n>>\n>> On Thu, 18 May 2017, Phillip Wood wrote:\n>>\n>>> From: Phillip Wood \n>>>\n>>> The message that's printed when auto-stashed changes are successfully\n>>> restored was missing '\\n' at the end.\n>>> ---\n>>\n>> Please add your Signed-off-by:, and my Acked-by:\n>\n> Will do (I forgot to add --signoff to git commit). Do I need to resend\n> the other patches with your Acked-by: or will that happen when Junio\n> applies them?\n>\n> I was thinking about this last night and wonder if it would be better to do\n>\n> - printf(_(\"Applied autostash.\"));\n> + printf(\"%s\\n\", _(\"Applied autostash.\"));\n>\n> rather than\n>\n> - printf(_(\"Applied autostash.\"));\n> + printf(_(\"Applied autostash.\\n\"));\n>\n> as it would avoid changing the translated string and also mean that the\n> newline couldn't be accidentally removed any typos in the translation.\n>\n> Best Wishes\n>\n> Phillip\n\nJust having the \\n in the message is fine. Stuff like this is already\nchecked for as part of the build process by msgfmt, e.g.:\n\n $ git diff -U0\n diff --git a/po/de.po b/po/de.po\n index 679f8f4720..b9a7d417ac 100644\n --- a/po/de.po\n +++ b/po/de.po\n @@ -23 +23 @@ msgid \"hint: %.*s\\n\"\n -msgstr \"Hinweis: %.*s\\n\"\n +msgstr \"Hinweis: %.*s\"\n\nErrors with:\n\n po/de.po:23: 'msgid' and 'msgstr' entries do not both end with '\\n'\n\nAnd if you change the format specifier:\n\n po/de.po:23: number of format specifications in 'msgid' and\n'msgstr' does not match\n"},{"id":"320272","messageId":"20170519143248.22358-1-phillip.wood@talktalk.net","threadId":"45995","inReplyTo":"20170518134154.12771-1-phillip.wood@talktalk.net","subject":"[PATCH v2] rebase -i: Add missing newline to end of message","fromName":"","fromEmail":"phillip.wood@talktalk.net","sentAt":"2017-05-19T14:32:48Z","receivedAt":"2017-05-19T14:33:28Z","isPatch":true,"sender":{"key":"phillip.wood@dunelm.org.uk","avatar":null},"body":"From: Phillip Wood \n\nThe message that's printed when auto-stashed changes are successfully\nrestored was missing '\\n' at the end.\n\nSigned-off-by: Phillip Wood \nAcked-by: Johannes Schindelin \n---\nI've added signed-off-by and acked-by lines to the commit message,\notherwise this is unchanged\n\n sequencer.c | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/sequencer.c b/sequencer.c\nindex 311728a145dfc66e230334221a2610468239932d..4dcf9c8be044247c6c18a4ec2a4675d9df9953eb 100644\n--- a/sequencer.c\n+++ b/sequencer.c\n@@ -1920,7 +1920,7 @@ static int apply_autostash(struct replay_opts *opts)\n \targv_array_push(&child.args, \"apply\");\n \targv_array_push(&child.args, stash_sha1.buf);\n \tif (!run_command(&child))\n-\t\tprintf(_(\"Applied autostash.\"));\n+\t\tprintf(_(\"Applied autostash.\\n\"));\n \telse {\n \t\tstruct child_process store = CHILD_PROCESS_INIT;\n \n-- \n2.13.0\n\n"},{"id":"320273","messageId":"a0912474-0d79-df10-80a8-5866398926a2@talktalk.net","threadId":"45995","inReplyTo":"CACBZZX5yyD-EA0obHKGGueUgf4xO9o=sBAsBOrrPipx3vNPmsA@mail.gmail.com","subject":"Re: [PATCH] rebase -i: Add missing newline to end of message","fromName":"Phillip Wood","fromEmail":"phillip.wood@talktalk.net","sentAt":"2017-05-19T14:35:34Z","receivedAt":"2017-05-19T14:35:42Z","isPatch":true,"sender":{"key":"phillip.wood@dunelm.org.uk","avatar":null},"body":"On 19/05/17 12:24, Ævar Arnfjörð Bjarmason wrote:\n> On Fri, May 19, 2017 at 12:13 PM, Phillip Wood\n> wrote:\n>> On 18/05/17 22:21, Johannes Schindelin wrote:\n>>> Hi Phillip,\n>>>\n>>> On Thu, 18 May 2017, Phillip Wood wrote:\n>>>\n>>>> From: Phillip Wood \n>>>>\n>>>> The message that's printed when auto-stashed changes are successfully\n>>>> restored was missing '\\n' at the end.\n>>>> ---\n>>>\n>>> Please add your Signed-off-by:, and my Acked-by:\n>>\n>> Will do (I forgot to add --signoff to git commit). Do I need to resend\n>> the other patches with your Acked-by: or will that happen when Junio\n>> applies them?\n>>\n>> I was thinking about this last night and wonder if it would be better to do\n>>\n>> - printf(_(\"Applied autostash.\"));\n>> + printf(\"%s\\n\", _(\"Applied autostash.\"));\n>>\n>> rather than\n>>\n>> - printf(_(\"Applied autostash.\"));\n>> + printf(_(\"Applied autostash.\\n\"));\n>>\n>> as it would avoid changing the translated string and also mean that the\n>> newline couldn't be accidentally removed any typos in the translation.\n>>\n>> Best Wishes\n>>\n>> Phillip\n> \n> Just having the \\n in the message is fine. Stuff like this is already\n> checked for as part of the build process by msgfmt, e.g.:\n> \n> $ git diff -U0\n> diff --git a/po/de.po b/po/de.po\n> index 679f8f4720..b9a7d417ac 100644\n> --- a/po/de.po\n> +++ b/po/de.po\n> @@ -23 +23 @@ msgid \"hint: %.*s\\n\"\n> -msgstr \"Hinweis: %.*s\\n\"\n> +msgstr \"Hinweis: %.*s\"\n> \n> Errors with:\n> \n> po/de.po:23: 'msgid' and 'msgstr' entries do not both end with '\\n'\n> \n> And if you change the format specifier:\n> \n> po/de.po:23: number of format specifications in 'msgid' and\n> 'msgstr' does not match\n> \nHi Ævar\n\nThanks for clarifying that, I've left the patch unchanged\n\nThanks again\n\nPhillip\n"}]}