Re: Bogus error: Untracked working tree file '....' would be overwritten by merge. Aborting

From: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date: Nov 17, 2010, 08:46 UTC
Message-ID: <vpqtyjgxrqk.fsf@bauges.imag.fr>
In-Reply-To: <AANLkTikeaj6kfq+pv+F0mOUSC7yJKnwyUgy9k8GPTpxg@mail.gmail.com>

Nguyen Thai Ngoc Duy <pclouds@gmail.com> writes:

Show 5 quoted lines

> On Tue, Nov 16, 2010 at 6:24 PM, Nguyen Thai Ngoc Duy <pclouds@gmail.com> wrote:
>> +static int identical_content(struct cache_entry *ce, struct stat *st)
>> +{
>> +       unsigned char sha1[20];
>> +       return !index_path(sha1, ce->name, st, 0) && !hashcmp(sha1, ce->sha1);

I do like the idea.

> Even better, do a file size check here. If it's not equal, there's no
> point in calling the expensive index_path().

I think you also need to check mode changes here.

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/