Fwd: How to tell what paths changed in a merge?

Oops... I just realized I did a "Reply" instead of "Reply-All".

It's been one of those days... sigh.

--wpd
On Mon, Mar 28, 2011 at 4:47 PM, Jeff King [off-list ref] wrote:

On Mon, Mar 28, 2011 at 04:39:03PM -0400, Patrick Doyle wrote:

quoted

Thank you for your quick reply...  you are correct in your assessment
that somebody botched a merge.  Probably several of them from several
different working trees.  I am trying to figure out

a) What he changed how & when

b) How to politely tell him not to do that again.

Heh. You're on your own for (b).

and I thought this was a full-service list.  Oh well :-)

Have you tried "git log -p broken-file"? That should show you everywhere
that broken-file was touched (and how). It might make more sense to use
"gitk broken-file", as I suspect the actual shape of history will be
useful in seeing what happened.

That's the bizarre thing -- "git log broken-file" doesn't show my
recent modifications at all, although "git log shows my commit where I
last modified the file (182451), followed (a few commits later) by his
merge commit.

git show 182451:path/to/broken-file

shows my most recent change to the file.

My commit got merged with one of his at 63252 without any problems.

That tree got merged with another one of his (from a different working
directory) at 693a2 and, for some reason, my original file shows up
from there on forward.

I think he probably did a "git pull" which failed (most of our
repository is binary CAD files, unfortunately), he probably uttered a
few choice words, threw things around the room, and then grabbed his
sledgehammer to force things back into the shape he wanted, and failed
to notice that he left some dents in other places.

I think I'm gonna have to just go back and review each of his merge
commits manually, compare the tree on one side to the tree on the
other, and figure out what got changed.

It's confusing to me that I can't figure out the right options to
git-log to make this easier.  "git log --name-status 693a2" doesn't
list any files as having changed.  I don't know what he did to force
the immediate ancestor of the file I changed to be re-committed to the
repository, but somehow he did that.

My biggest concern is to wonder what else got stomped on as he wielded
his sledgehammer.

I just noticed your suggestion about "gitk broken-file".  I think I'll
go give that a shot and see what I can learn from that.
--wpd