git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Constantine Plotnikov <constantine.plotnikov@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Bo Yang <struggleyb.nku@gmail.com>,
	Git Mailing List <git@vger.kernel.org>,
	Linus Torvalds <torvalds@linux-foundation.org>
Subject: Re: BUG: git log: fatal: internal error in diff-resolve-rename-copy
Date: Tue, 17 Aug 2010 18:48:59 +0400	[thread overview]
Message-ID: <AANLkTi=wWii8ep78G7OuyFQ+W9xsm6O-WVZBGyPJjg-p@mail.gmail.com> (raw)
In-Reply-To: <7vpqxmjphl.fsf@alter.siamese.dyndns.org>

On Fri, Aug 13, 2010 at 11:12 PM, Junio C Hamano <gitster@pobox.com> wrote:
> Junio C Hamano <gitster@pobox.com> writes:
>
>> Constantine Plotnikov <constantine.plotnikov@gmail.com> writes:
>>
>>> Somewhere between the git 1.7.0.2 and the git 1.7.2.0 the rename
>>> detection started to fail with fatal error on some files in our
>>> repository. The bug could be seen on the public IntelliJ IDEA
>>> repository (about 760M in size), but our users have reported it as
>>> well.
>> ...
>> But what 1da6175 (Make diffcore_std only can run once before a diff_flush,
>> 2010-05-06) did is clearly wrong.  Not wanting to call resolve-rename-copy
>> does not mean we do not want to run the rest of what diffcore_std() does
>> at all!  For example, "-S" and "--diff-filter=" options are processed in
>> that function; the exit status of the command based on the presense of
>> difference is computed in the function, too.
>
> This reverts 1da6175 (Make diffcore_std only can run once before a
> diff_flush, 2010-05-06) and replaces it with an uglier looking but
> hopefully correct fix.
>
> Constantine, does it fix your issue?
>
Yes. It fixes the issue on the known problematic files. The patch was
tested over 3235b7053 in the git.git master. Please apply it to the
next update.

Thank You,
Constantine

      parent reply	other threads:[~2010-08-17 14:49 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-08-13 11:25 BUG: git log: fatal: internal error in diff-resolve-rename-copy Constantine Plotnikov
2010-08-13 13:38 ` Ævar Arnfjörð Bjarmason
2010-08-13 17:36 ` Junio C Hamano
2010-08-13 17:53   ` Linus Torvalds
2010-08-13 19:12   ` Junio C Hamano
2010-08-13 19:46     ` [PATCH] diff --follow: do call diffcore_std() as necessary Junio C Hamano
2010-08-13 21:27       ` Ævar Arnfjörð Bjarmason
2010-08-13 22:46         ` Junio C Hamano
2010-08-14  1:10           ` [PATCH] log: test for regression introduced in v1.7.2-rc0~103^2~2 Ævar Arnfjörð Bjarmason
2010-08-14  1:19             ` Ævar Arnfjörð Bjarmason
2010-08-15  9:08               ` Junio C Hamano
2010-08-15  9:24                 ` Ævar Arnfjörð Bjarmason
2010-08-16  1:49                   ` Junio C Hamano
2010-08-16  2:01                     ` Ævar Arnfjörð Bjarmason
2010-08-15 10:16                 ` [PATCH v2] " Ævar Arnfjörð Bjarmason
2010-08-17 14:48     ` Constantine Plotnikov [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

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='AANLkTi=wWii8ep78G7OuyFQ+W9xsm6O-WVZBGyPJjg-p@mail.gmail.com' \
    --to=constantine.plotnikov@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=struggleyb.nku@gmail.com \
    --cc=torvalds@linux-foundation.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.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).