From: Martin Waitz <tali@admingilde.org>
To: Junio C Hamano <junkio@cox.net>
Cc: git@vger.kernel.org
Subject: Re: comparing file contents in is_exact_match?
Date: Thu, 6 Jul 2006 09:16:29 +0200 [thread overview]
Message-ID: <20060706071629.GB12512@admingilde.org> (raw)
In-Reply-To: <7vd5cj9rvm.fsf@assigned-by-dhcp.cox.net>
[-- Attachment #1: Type: text/plain, Size: 706 bytes --]
hoi :)
On Wed, Jul 05, 2006 at 11:20:13PM -0700, Junio C Hamano wrote:
> Martin Waitz <tali@admingilde.org> writes:
> > Why is the content comparision in is_exact_match needed?
>
> Because your working tree can be out of sync with respect to
> what's in the index, in which case we cannot trust the sha1
> while running diff-index (without --cached flag).
so perhaps we need three phases instead of two:
first sort out all renames that can be detected by the sha1,
then compare file contents and finally do the diff.
> git-update-index --refresh before doing anything might help.
At the moment it is doing (N-1)^2 content compares, even if
the index is in sync.
--
Martin Waitz
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 189 bytes --]
next prev parent reply other threads:[~2006-07-06 7:16 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-07-06 5:57 comparing file contents in is_exact_match? Martin Waitz
2006-07-06 6:20 ` Junio C Hamano
2006-07-06 7:16 ` Martin Waitz [this message]
2006-07-06 7:33 ` Junio C Hamano
2006-07-06 7:41 ` Martin Waitz
2006-07-06 17:55 ` Martin Waitz
2006-07-07 16:33 ` Florian Weimer
2006-07-08 2:50 ` Johannes Schindelin
2006-07-16 9:05 ` Florian Weimer
2006-07-16 14:00 ` Johannes Schindelin
2006-07-16 15:03 ` Yakov Lerner
2006-07-16 22:36 ` Alex Riesen
2006-07-17 5:25 ` Florian Weimer
2006-07-17 12:41 ` Johannes Schindelin
2006-07-17 15:43 ` Linus Torvalds
2006-07-17 16:05 ` Johannes Schindelin
2006-07-17 17:56 ` Linus Torvalds
2006-07-17 18:15 ` Martin Waitz
2006-07-17 20:20 ` Alex Riesen
2006-07-17 19:37 ` Geert Bosch
2006-07-17 21:31 ` Linus Torvalds
2006-07-18 9:38 ` Yakov Lerner
2006-07-18 10:20 ` Johannes Schindelin
2006-07-18 15:37 ` Linus Torvalds
2006-07-18 18:49 ` Alex Riesen
2006-07-17 16:32 ` Juergen Ruehle
2006-07-17 17:10 ` Johannes Schindelin
2006-07-17 17:37 ` Juergen Ruehle
2006-07-17 20:32 ` Yakov Lerner
2006-07-17 22:43 ` Juergen Ruehle
2006-07-18 9:15 ` Yakov Lerner
2006-07-17 12:11 ` Yakov Lerner
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=20060706071629.GB12512@admingilde.org \
--to=tali@admingilde.org \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
/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).