Re: [PATCH] git add: respect core.filemode even with unmerged entriesin the index

From: Johannes Sixt <j.sixt@eudaptics.com>
Date: Jun 29, 2007, 06:57 UTC
Message-ID: <4684AD41.9868C32F@eudaptics.com>
In-Reply-To: <Pine.LNX.4.64.0706281653260.4438@racer.site>

Johannes Schindelin wrote:

Show 18 quoted lines

> 
> When a merge left unmerged entries, git add failed to pick up the
> file mode from the index, when core.filemode == 0.
> 
> Noticed by Johannes Sixt.
> 
> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> ---
> 
>         On Thu, 28 Jun 2007, Johannes Sixt wrote:
> 
>         > Johannes Sixt wrote:
>         >
>         > The deficiency is not in merge-recursive, but in 'git add'. The
>         > problem is that after a conflicted merge of an executable file
>         > 'git add' loses the +x bit even if core.filemode=false.
> 
>         How's that?

That's fine, thanks.

It covers the most common case that all three stages are in the index. However, if only two stages are present, the file mode is still taken from the file instead of from the index. As that easy to solve (at least for the unambiguous case)?

-- Hannes