Re: crash on git diff-tree -Ganything <tree> for new files with textconv filter

From: Jeff King <peff@peff.net>
Date: Oct 29, 2012, 22:47 UTC
Message-ID: <20121029224705.GA32148@sigill.intra.peff.net>
In-Reply-To: <20121029223521.GJ20513@sigill.intra.peff.net>

On Mon, Oct 29, 2012 at 06:35:21PM -0400, Jeff King wrote:

Show 9 quoted lines

> The patch below fixes it, but it's terribly inefficient (it just detects
> the situation and reallocates). It would be much better to disable the
> reuse_worktree_file mmap when we populate the filespec, but it is too
> late to pass an option; we may have already populated from an earlier
> diffcore stage.
> 
> I guess if we teach the whole diff code that "-G" (and --pickaxe-regex)
> is brittle, we can disable the optimization from the beginning based on
> the diff options. I'll take a look.

Hmm. That is problematic for two reasons.

  1. The whole diff call chain will have to be modified to pass the
     options around, so they can make it down to the
     diff_populate_filespec level. Alternatively, we could do some kind
     of global hack, which is ugly but would work OK in practice.

  2. Reusing a working tree file is only half of the reason a filespec
     might be mmap'd. It might also be because we are literally diffing
     the working tree. "-G" was meant to be used to limit log traversal,
     but it also works to reduce the diff output for something like "git
     diff HEAD^".

I really wish there were an alternate regexec interface we could use that took a pointer/size pair. Bleh.

-Peff