Re: git-whatchanged does not show merge result?

Hi,

Maybe someone can clear up a confusion I have with git-whatchanged. I created a new repo with just one file hello, split out a new branch "mybranch. When I merged back the changes from mybranch, git-whatchanged -p did not should the diff of the merge. Does it have some special behaviour I am not aware of. I'd appreciate if you can clarify. Notice that git-whatchange does not show the diff between (last commit) fd494be and 83ac91a1

Thanks, David

git version 0.99.7b

commands used (roughly to repeat the test)

mkdir git-tutorial cd git-tutorial git-init-db echo "Hello World" >hello git-update-index --add hello echo "It's a new day for git" >>hello echo "Initial commit" | git-commit-tree $(git-write-tree) > .git/HEAD git -m "added It's a new day..." commit hello git checkout -b mybranch git checkout mybranch echo "Work, work, work" >>hello git commit -m 'Some work.' hello git checkout master echo "Play, play, play" >>hello git commit -m 'Some fun.' hello git pull . mybranch vi hello (merge the change by hand...) git -m "merge work,work,... from mybranch" commit hello

last commit #cat .git/HEAD fd494becb20a8d9eddad01921de1cc9fe2cbf354

output from git-whatchanged -p hello

diff-tree 83ac91a13297887760f252aa9026e76235adcdd9 (from
7a78a9c5bb38ad4db1b5c9b14c1d409b2f36c0b0)
Author:  <davidho@penguin.nanometrics.ca>
Date:   Fri Oct 14 12:02:50 2005 -0400

    Some fun.