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

Re: [PATCH 2/9] Add flag to make unpack_trees() not print errors.

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Feb 5, 2008, 01:16 UTC
Message-ID
<alpine.LSU.1.00.0802050112380.8543@racer.site>
In-Reply-To
<alpine.LNX.1.00.0802041335390.13593@iabervon.org>
Hi,
On Mon, 4 Feb 2008, Daniel Barkalow wrote:
> This will allow builtin-checkout to suppress merge errors if it's going 
> to try more merging methods.

I saw one error() in twoway_merge(), one in bind_merge(), and one in onway_merge() that were not guarded by o->gently.

Also, I'd call it "silent", not "gently".
Show 5 quoted lines
> Additionally, if unpack_trees() returns with an error, but without 
> printing anything, it will roll back any changes to the index (by 
> rereading the index, currently). This obviously could be done by the 
> caller, but chances are that the caller would forget and debugging this 
> is difficult.

Granted, it is easy to forget. But maybe the caller does not need the index? Or maybe it wants a different one? I'd prefer the caller to clean up, if necessary.

Ciao, Dscho

Previous: Daniel BarkalowNext: Daniel Barkalow
Message 2 of 5 in “Add flag to make unpack_trees() not print errors.”
  1. 2/9 Add flag to make unpack_trees() not print errors.Daniel Barkalow, Feb 4, 2008
  2. Johannes SchindelinFeb 5, 2008
  3. Daniel BarkalowFeb 5, 2008
  4. Junio C HamanoFeb 5, 2008
  5. Daniel BarkalowFeb 6, 2008

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.