Re: Bogus error: Untracked working tree file '....' would be overwritten by merge. Aborting
- From
- demerphq <demerphq@gmail.com>
- Date
- Nov 17, 2010, 08:37 UTC
- Message-ID
- <AANLkTimp1ZvVLnRQa+LssbeO7F=9MrA56aZgFHQnbZCK@mail.gmail.com>
- In-Reply-To
- <AANLkTikeaj6kfq+pv+F0mOUSC7yJKnwyUgy9k8GPTpxg@mail.gmail.com>
On 16 November 2010 12:34, Nguyen Thai Ngoc Duy <pclouds@gmail.com> wrote:
Show 8 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);
>
> Even better, do a file size check here. If it's not equal, there's no
> point in calling the expensive index_path().I tried your patch, with the size check modification, and it seems to work (meaning it passed all existing tests).
Ill try to put together tests and a proper patch soon.
Im hoping that if someone thinks that such a patch would be dismissed out of hand that they will let me know....
cheers, Yves
-- perl -Mre=debug -e "/just|another|perl|hacker/"