From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Tue, 05 Feb 2008 01:16:34 GMT
Subject: Re: [PATCH 2/9] Add flag to make unpack_trees() not print errors.
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".

> 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