From: Jim Meyering <jim@meyering•net>
To: git list <git@vger•kernel.org>
Subject: [PATCH for next] insert missing newline in a diagnostic
Date: Mon, 30 Aug 2010 11:40:24 +0200 [thread overview]
Message-ID: <87iq2s4ewn.fsf@meyering.net> (raw)
When merging, I would get a message like this:
error: The following untracked working tree files would be overwritten by merge:
FILE_NAMEPlease move or remove them before you can merge.
This change inserts the newline after FILE_NAME.
Signed-off-by: Jim Meyering <meyering@redhat•com>
---
merge-recursive.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/merge-recursive.c b/merge-recursive.c
index aadd48c..e81c995 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -1307,7 +1307,7 @@ void set_porcelain_error_msgs(const char **msgs, const char *cmd)
"Updating the following directories would lose untracked files in it:\n%s";
if (advice_commit_before_merge)
- msg = "The following untracked working tree files would be %s by %s:\n%%s"
+ msg = "The following untracked working tree files would be %s by %s:\n%%s\n"
"Please move or remove them before you can %s.";
else
msg = "The following untracked working tree files would be %s by %s:\n%%s";
--
1.7.2.2.510.g7180a
next reply other threads:[~2010-08-30 9:40 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-30 9:40 Jim Meyering [this message]
2010-09-01 0:17 ` [PATCH for next] insert missing newline in a diagnostic Jonathan Nieder
2010-09-01 6:04 ` Matthieu Moy
2010-09-01 6:05 ` [PATCH] Make sure show_all_errors when using porcelain error messages Matthieu Moy
2010-09-01 14:59 ` Junio C Hamano
2010-09-01 17:04 ` Matthieu Moy
2010-09-01 17:54 ` Junio C Hamano
2010-09-02 11:57 ` [PATCH 0/3] (hopefully) Proper fix to set show_all_errors where needed Matthieu Moy
2010-09-03 14:18 ` Jim Meyering
2010-09-03 15:25 ` [PATCH] t7609-merge-co-error-msgs: test non-fast forward case too Matthieu Moy
2010-09-02 11:57 ` [PATCH 1/3] Move set_porcelain_error_msgs to unpack-trees.c and rename it Matthieu Moy
2010-09-02 11:57 ` [PATCH 2/3] setup_unpack_trees_porcelain: take the whole options struct as parameter Matthieu Moy
2010-09-02 11:57 ` [PATCH 3/3] Move "show_all_errors = 1" to setup_unpack_trees_porcelain() Matthieu Moy
2010-09-02 15:52 ` Junio C Hamano
2010-09-02 16:06 ` Matthieu Moy
2010-09-02 16:08 ` [PATCH v2] " Matthieu Moy
2010-09-02 8:20 ` [PATCH for next] insert missing newline in a diagnostic Jim Meyering
2010-09-02 8:42 ` Matthieu Moy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87iq2s4ewn.fsf@meyering.net \
--to=jim@meyering$(echo .)net \
--cc=git@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox