git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH for next] insert missing newline in a diagnostic

From
Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date
Sep 1, 2010, 06:04 UTC
Message-ID
<vpqeide0zkx.fsf@bauges.imag.fr>
In-Reply-To
<20100901001729.GG6747@burratino>
Jonathan Nieder <jrnieder@gmail.com> writes:
Show 21 quoted lines
> 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: Matthieu Moy
Message 1 of 16 in “Re: [PATCH for next] insert missing newline in a diagnostic”
  1. Matthieu MoySep 1, 2010
  2. Make sure show_all_errors when using porcelain error messagesMatthieu Moy, Sep 1, 2010
  3. Junio C HamanoSep 1, 2010
  4. Matthieu MoySep 1, 2010
  5. Junio C HamanoSep 1, 2010
  6. 0/3 (hopefully) Proper fix to set show_all_errors where neededMatthieu Moy, Sep 2, 2010
  7. Jim MeyeringSep 3, 2010
  8. t7609-merge-co-error-msgs: test non-fast forward case too.Matthieu Moy, Sep 3, 2010
  9. 1/3 Move set_porcelain_error_msgs to unpack-trees.c and rename itMatthieu Moy, Sep 2, 2010
  10. 2/3 setup_unpack_trees_porcelain: take the whole options struct as parameterMatthieu Moy, Sep 2, 2010
  11. 3/3 Move "show_all_errors = 1" to setup_unpack_trees_porcelain()Matthieu Moy, Sep 2, 2010
  12. Junio C HamanoSep 2, 2010
  13. Matthieu MoySep 2, 2010
  14. Move "show_all_errors = 1" to setup_unpack_trees_porcelain()Matthieu Moy, Sep 2, 2010
  15. Jim MeyeringSep 2, 2010
  16. Matthieu MoySep 2, 2010

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.