Re: gitk "find commit adding/removing string"/possible pickaxe bug?

From: Thomas Rast <trast@student.ethz.ch>
Date: Jan 18, 2011, 16:44 UTC
Message-ID: <201101181744.18139.trast@student.ethz.ch>
In-Reply-To: <514EB3AA-CD31-4BDB-B777-B7AAEEDF5663@sebastianhahn.net>

Sebastian Hahn wrote:

Show 5 quoted lines

> 
> I quite like gitk and am a fan of the ability to easily locate commits
> where a specific string was added/removed. If the string in question
> was added in a merge commit as part of a conflicted/otherwise
> changed merge, gitk doesn't display it.

[...]

> I presented the issue to #git, and it was suggested that it is probably
> a pickaxe bug

In particular, in a history where

  $ git show HEAD:foo
  quux
  $ git show HEAD^:foo
  bar
  $ git show HEAD^2:foo
  baz

the behaviour is:

  git log -Squux                  # empty
  git log -Squux -p               # empty
  git log -Squux --pickaxe-all    # empty

  git log -Squux -c      	  # shows merge, but no diff
  git log -Squux --cc    	  # shows merge, but no diff
  git log -Squux -c -p   	  # shows merge, but no diff
  git log -Squux -c --pickaxe-all # shows merge, but no diff

  git log -Squux --pickaxe-all -c -p  # shows merge & combined diff

So it only shows the diff with --pickaxe-all, even though the (only) hunk clearly introduced the string.

-- 
Thomas Rast
trast@{inf,student}.ethz.ch