From: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
To: Jonathan Nieder <jrnieder@gmail.com>
Cc: Jim Meyering <jim@meyering.net>, git list <git@vger.kernel.org>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH for next] insert missing newline in a diagnostic
Date: Wed, 01 Sep 2010 08:04:14 +0200 [thread overview]
Message-ID: <vpqeide0zkx.fsf@bauges.imag.fr> (raw)
In-Reply-To: <20100901001729.GG6747@burratino> (Jonathan Nieder's message of "Tue\, 31 Aug 2010 19\:17\:29 -0500")
Jonathan Nieder <jrnieder@gmail.com> writes:
> 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.
That sounds like an explanation. The patch series did two things:
override plumbing error messages, and introducing show_all_errors. The
two are meant to work together, and clearly, if you set one without
the other, you get surprising results. A fix would be to make sure
that we set both in the same places.
Patch follows, untested. Jim, can you tell us whether it fixes the
problem? If not, can your give us a reproduction script (preferably as
a patch to t7609-merge-co-error-msgs.sh)?
Thanks,
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
next prev parent reply other threads:[~2010-09-01 6:08 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
2010-09-01 6:04 ` Matthieu Moy [this message]
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=vpqeide0zkx.fsf@bauges.imag.fr \
--to=matthieu.moy@grenoble-inp.fr \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jim@meyering.net \
--cc=jrnieder@gmail.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.