{"thread":{"id":"24909","subject":"[PATCH for next] insert missing newline in a diagnostic","startedAt":"2010-08-30T09:40:24Z","lastAt":"2010-09-01T00:17:29Z","messageCount":2,"participants":["Jim Meyering","Jonathan Nieder"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"149295","messageId":"87iq2s4ewn.fsf@meyering.net","threadId":"24909","inReplyTo":null,"subject":"[PATCH for next] insert missing newline in a diagnostic","fromName":"Jim Meyering","fromEmail":"jim@meyering.net","sentAt":"2010-08-30T09:40:24Z","receivedAt":"2010-08-30T09:40:24Z","isPatch":true,"sender":{"key":"jim@meyering.net","avatar":"https://avatars.githubusercontent.com/u/710630?v=4"},"body":"\nWhen merging, I would get a message like this:\n\n  error: The following untracked working tree files would be overwritten by merge:\n  FILE_NAMEPlease move or remove them before you can merge.\n\nThis change inserts the newline after FILE_NAME.\n\nSigned-off-by: Jim Meyering <meyering@redhat.com>\n---\n merge-recursive.c |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/merge-recursive.c b/merge-recursive.c\nindex aadd48c..e81c995 100644\n--- a/merge-recursive.c\n+++ b/merge-recursive.c\n@@ -1307,7 +1307,7 @@ void set_porcelain_error_msgs(const char **msgs, const char *cmd)\n \t\t\"Updating the following directories would lose untracked files in it:\\n%s\";\n\n \tif (advice_commit_before_merge)\n-\t\tmsg = \"The following untracked working tree files would be %s by %s:\\n%%s\"\n+\t\tmsg = \"The following untracked working tree files would be %s by %s:\\n%%s\\n\"\n \t\t\t\"Please move or remove them before you can %s.\";\n \telse\n \t\tmsg = \"The following untracked working tree files would be %s by %s:\\n%%s\";\n--\n1.7.2.2.510.g7180a\n"},{"id":"149514","messageId":"20100901001729.GG6747@burratino","threadId":"24909","inReplyTo":"87iq2s4ewn.fsf@meyering.net","subject":"Re: [PATCH for next] insert missing newline in a diagnostic","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2010-09-01T00:17:29Z","receivedAt":"2010-09-01T00:17:29Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"(+cc: Matthieu, Junio)\n\nHi Jim,\n\nJim Meyering wrote:\n\n> When merging, I would get a message like this:\n> \n>   error: The following untracked working tree files would be overwritten by merge:\n>   FILE_NAMEPlease move or remove them before you can merge.\n> \n> This change inserts the newline after FILE_NAME.\n\nI fear it is more complicated.  With your patch, in some situations\n(e.g., when running t7609-merge-co-error-msgs.sh) I get a leading tab\nand extra newline:\n\n error: The following untrack...\n\tFILE_NAME\n\n Please move or remove them before you can merge.\n\nIn unpack-trees, display_error_msgs() prints the version with a tab\nbut you are getting the message from add_rejected_path which suggests\nto me that o->show_all_errors is unset.\n\nWas there some other error before then?\n\nJonathan\n\n[1] http://thread.gmane.org/gmane.comp.version-control.git/152965/focus=153211\n"}]}