Re: path limiting broken

From: Linus Torvalds <torvalds@osdl.org>
Date: Apr 16, 2006, 17:58 UTC
Message-ID: <Pine.LNX.4.64.0604161052310.3701@g5.osdl.org>
In-Reply-To: <Pine.LNX.4.63.0604161931530.19020@wbgn013.biozentrum.uni-wuerzburg.de>

On Sun, 16 Apr 2006, Johannes Schindelin wrote:

Show 9 quoted lines

> 
> I finally found the commit which removed parse_whatchanged_opt() from 
> log-tree.c by
> 
> 	git-rev-list 4a617..next | while read commit; do \
> 		echo $commit; \
> 		git diff $commit^..$commit log-tree.c | \
> 			grep parse_whatchanged; \
> 	done | less

Heh. You really should learn about "-m -p", which does the above, but better (it compares against _all_ parents - you would have missed the thing _again_ if the "lt/logopt" branch had been the main branch ;)

> However, the combined diff of that commit does not show it, while the diff 
> to the first parent does:
> 
> 	git-show --cc 43f934aa90 | grep parse_whatchanged

Combined merges really only show conflicts where the different parents do something different from the end result. Since the whole file was taken from the lt/logopt branch, even

	git show -c 43f934aa90

won't show that "log-tree.c" file AT ALL, because there was no content conflict: the whole file was taken from one branch, unmodified.

If you want to see all changes against all parents, you really do need "-m -p" (or just "-m", which will show the raw diffs, and which will show how the file changes from one parent, but not the other).

Note that NORMALLY, you'd really never want to use "-m -p". It's a very very inconvenient format, since normally you want to see only the stuff that changed wrt the end result.

So "--cc" really does ignore everything that is irrelevant for the end result, and in this case you are very much trying to find somethign that is totally irrelevant for the end result, since the function you look for had never even _existed_ in the file as far as the end result goes..

		Linus