From: Jonathan Nieder <jrnieder@gmail.com>
To: Jim Meyering <jim@meyering.net>
Cc: git list <git@vger.kernel.org>,
Junio C Hamano <gitster@pobox.com>,
Matthieu Moy <Matthieu.Moy@imag.fr>
Subject: Re: [PATCH for next] insert missing newline in a diagnostic
Date: Tue, 31 Aug 2010 19:17:29 -0500 [thread overview]
Message-ID: <20100901001729.GG6747@burratino> (raw)
In-Reply-To: <87iq2s4ewn.fsf@meyering.net>
(+cc: Matthieu, Junio)
Hi Jim,
Jim Meyering wrote:
> 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.
I fear it is more complicated. With your patch, in some situations
(e.g., when running t7609-merge-co-error-msgs.sh) I get a leading tab
and extra newline:
error: The following untrack...
FILE_NAME
Please move or remove them before you can merge.
In unpack-trees, display_error_msgs() prints the version with a tab
but you are getting the message from add_rejected_path which suggests
to me that o->show_all_errors is unset.
Was there some other error before then?
Jonathan
[1] http://thread.gmane.org/gmane.comp.version-control.git/152965/focus=153211
next prev parent reply other threads:[~2010-09-01 0:19 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-30 9:40 [PATCH for next] insert missing newline in a diagnostic Jim Meyering
2010-09-01 0:17 ` Jonathan Nieder [this message]
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=20100901001729.GG6747@burratino \
--to=jrnieder@gmail.com \
--cc=Matthieu.Moy@imag.fr \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jim@meyering.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).