From: Nguyen Thai Ngoc Duy <pclouds@gmail.com>
To: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
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 16:33:56 +0700 [thread overview]
Message-ID: <AANLkTinOFZ=qbCeeUmN7FcPFJT=SZqXEMsuof98ZW-Wh@mail.gmail.com> (raw)
In-Reply-To: <vpqtyjgxrqk.fsf@bauges.imag.fr>
On Wed, Nov 17, 2010 at 3:46 PM, Matthieu Moy
<Matthieu.Moy@grenoble-inp.fr> wrote:
>> 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.
Hmm.. ce_compare_data() does the same thing as identical_content() and
will be called by ie_match_stat() in racy condition. I think we should
add another flag to ie_match_stat() and let it call ce_compare_data(),
instead of creating a new function identical_content().
ie_match_stat() does check mode changes and other stuff so if it
returns 0 (with ce_compare_data() called), it's safe.
--
Duy
prev parent reply other threads:[~2010-11-17 9:34 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
2010-11-17 9:33 ` Nguyen Thai Ngoc Duy [this message]
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='AANLkTinOFZ=qbCeeUmN7FcPFJT=SZqXEMsuof98ZW-Wh@mail.gmail.com' \
--to=pclouds@gmail.com \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=avarab@gmail.com \
--cc=demerphq@gmail.com \
--cc=git@vger.kernel.org \
/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).