Re: Re: git log -M -- filename is not working?

From: Eli Barzilay <eli@barzilay.org>
Date: May 12, 2010, 14:35 UTC
Message-ID: <19434.48308.815673.263230@winooski.ccs.neu.edu>
In-Reply-To: <20100512124948.GA11761@coredump.intra.peff.net>

On May 12, Jeff King wrote:

Show 9 quoted lines

> On Wed, May 12, 2010 at 08:01:59AM -0400, Eli Barzilay wrote:
> 
> > > I have no opinion on moving --follow around, but I definitely agree that
> > > more clearly marking the diff-options (and including them after
> > > revision traversal options) is much better.
> > 
> > Should I send that reorganization as a proper patch then?
> 
> Yes, please.

Done.

Show 10 quoted lines

> > > This ":git-log: 1" magic should probably follow the include. It sets up
> > > an attribute for diff-options.txt to conditionally include some
> > > log-specific bits.
> > 
> > It seemed like it's a definition that could be used elsewhere too (eg,
> > in other includes that could be added in the future).
> 
> Yeah, I considered that, too. So maybe it is best at the top of the
> options list (but in that case, perhaps it should go at the very top
> of the file).

Since I don't know, I just dragged it along with the include. (Moving it to the top would be better better done with the other files, so it's a different thing...)

> Anyway, here is the patch. My testing so far has been very simple,
> so please try it on a few repos and let me know if it does what you
> expect in all cases. Note that is based on "next", as it has Bo's
> find_copies_harder patch.

I tried it with our repository -- it does what I expected it to do wrt showing the log messages, and at a very small penalty (~0.9s vs ~0.7s for scanning a history of about 20k commits).

But with `-p' it was doing something confusing: I used two files that were recently renamed, and the result was the correct log history, but the first patch that was shown (the rename) showed the two files as added. (That's even when I added `-C' and `-M'.) This happens even with a single path. OTOH, using `--follow' with `-p' and a single path without your patch produces the expected result where the first patch is a rename (even without `-C'/`-M').

-- 
          ((lambda (x) (x x)) (lambda (x) (x x)))          Eli Barzilay:
                    http://barzilay.org/                   Maze is Life!