From: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
To: Nguyen Thai Ngoc Duy <pclouds@gmail.com>
Cc: demerphq <demerphq@gmail.com>, Git <git@vger.kernel.org>,
"Ævar Arnfjörð" <avarab@gmail.com>
Subject: Re: Bogus error: Untracked working tree file '....' would be overwritten by merge. Aborting
Date: Wed, 17 Nov 2010 09:46:11 +0100 [thread overview]
Message-ID: <vpqtyjgxrqk.fsf@bauges.imag.fr> (raw)
In-Reply-To: <AANLkTikeaj6kfq+pv+F0mOUSC7yJKnwyUgy9k8GPTpxg@mail.gmail.com> (Nguyen Thai Ngoc Duy's message of "Tue\, 16 Nov 2010 18\:34\:40 +0700")
Nguyen Thai Ngoc Duy <pclouds@gmail.com> writes:
> 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/
next prev parent reply other threads:[~2010-11-17 8:50 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-16 10:26 Bogus error: Untracked working tree file '....' would be overwritten by merge. Aborting demerphq
2010-11-16 10:38 ` demerphq
2010-11-16 11:24 ` Nguyen Thai Ngoc Duy
2010-11-16 11:34 ` Nguyen Thai Ngoc Duy
2010-11-17 8:37 ` demerphq
2010-11-17 9:22 ` Ævar Arnfjörð Bjarmason
2010-11-17 8:46 ` Matthieu Moy [this message]
2010-11-17 9:33 ` Nguyen Thai Ngoc Duy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=vpqtyjgxrqk.fsf@bauges.imag.fr \
--to=matthieu.moy@grenoble-inp.fr \
--cc=avarab@gmail.com \
--cc=demerphq@gmail.com \
--cc=git@vger.kernel.org \
--cc=pclouds@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).