git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Matt Pearson <404emailnotfound@gmail.com>
To: "Björn Steinbrink" <B.Steinbrink@gmx.de>
Cc: Alexander Toresson <alexander.toresson@gmail.com>, git@vger.kernel.org
Subject: Re: git diff infinite loop at attempt to diff two specific commits
Date: Sun, 5 Jul 2009 14:22:00 -0400	[thread overview]
Message-ID: <706b4240907051122s784e97abkde5628189956ceb0@mail.gmail.com> (raw)
In-Reply-To: <20090705181208.GA8629@atjola.homenet>

2009/7/5 Björn Steinbrink <B.Steinbrink@gmx.de>:
> On 2009.07.05 19:37:44 +0200, Alexander Toresson wrote:
>> Hello,
>>
>> I've got problems with git diff, it hangs in an infinite loop when
>> attempting to generate a diff between two specific commits. Commands
>> to reproduce:
>>
>> git clone git://eulex.zapto.org/nightfall.git
>> cd nightfall
>> git diff --stat 597711..61a139
>>
>> (Note that the clone needs to fetch 16mb)
>>
>> I'm running git 1.6.3.3.
>
> FWIW, it "hangs" on the save.xml file. The old version is 1.2M, the new
> one is 9M. Using the patience diff algorithm to compare them takes about
> 5 seconds here, while the default algorithm took 6m15s.

I can confirm this for the 1.6.0.4 shipped with Ubuntu Jaunty (so this
would seem to not be a recent change). Actually, it may be worse: mine
is still running after 8 minutes, and this machine is almost
brand-new. Normal diff -u on the two versions of the file finishes in
under a second.

On an unrelated note, it's usually a bad idea to have files like
configure and *.suo in the repo (and possibly this save.xml as well).

  reply	other threads:[~2009-07-05 18:22 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-07-05 17:37 git diff infinite loop at attempt to diff two specific commits Alexander Toresson
2009-07-05 18:12 ` Björn Steinbrink
2009-07-05 18:22   ` Matt Pearson [this message]
2009-07-05 20:09     ` Alexander Toresson
2009-07-05 21:21       ` Matt Pearson

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=706b4240907051122s784e97abkde5628189956ceb0@mail.gmail.com \
    --to=404emailnotfound@gmail.com \
    --cc=B.Steinbrink@gmx.de \
    --cc=alexander.toresson@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).