From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri, 29 Jun 2007 10:06:11 GMT
Subject: Re: [PATCH] git add: respect core.filemode even with unmerged entries in the index
Message-ID: <Pine.LNX.4.64.0706291103470.4438@racer.site>
In-Reply-To: <7vir97f98o.fsf@assigned-by-dhcp.pobox.com>

Hi,

On Fri, 29 Jun 2007, Junio C Hamano wrote:

> Hmph.
> 
>  * Are you sure about (1-pos)?
> 
>  * I _think_ we would want to favor our stage (i.e. #2)

Hmph back.

I _thought_ that our stage is #1, not even bothering to check the 
documentation. But it seems that you are right.

So your code looks fine to me, except that I would move the whole 
get_index_entry_for_file_even_if_the_entry_is_unmerged(name, namelen) 
code into its own function.

Want me to prepare a patch? If so, I'll do it tonight, since I will be 
occupied the rest of the (working) day.

Ciao,
Dscho