From: Thomas Rast <trast@student.ethz.ch>
Date: Tue, 18 Jan 2011 20:39:28 GMT
Subject: Re: gitk "find commit adding/removing string"/possible pickaxe bug?
Message-ID: <201101182139.28808.trast@student.ethz.ch>
In-Reply-To: <20110118185027.GA10562@sigill.intra.peff.net>

Jeff King wrote:
> commit() {
>   echo $1 >file && git add file && git commit -m $1
> }
> mkdir repo && cd repo && git init
> commit base
> commit master
> git checkout -b other HEAD^
> commit other
> git merge master
> commit resolved

Indeed, my history looks just like that.

> >   git log -Squux -c -p          # shows merge, but no diff
> 
> Weird.  Here I get a nice combined diff, which is what I expect.

True, I managed to confuse myself between looking for the resolution and
looking for one of the (deleted) merge sides.

So indeed

  git log -Squux -c -p

gives a combined diff.  But OTOH

  git log -Sbar -c -p

doesn't; it only gives a diff for the commit that introduced 'bar'.  I
guess this makes sense: -S notices that the number of 'bar's is
actually the same as in *one* merge parent, hence the merge cannot be
all that interesting.  OTOH it still shows the merge commit in the
history, which is a bit strange.  --pickaxe-all does not make a
difference either;

   git log -Sbar --cc -p --pickaxe-all

still shows the merge commit but no diff.

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