Re: path limiting broken (NOT)
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Apr 16, 2006, 17:27 UTC
- Message-ID
- <Pine.LNX.4.63.0604161911530.18261@wbgn013.biozentrum.uni-wuerzburg.de>
- In-Reply-To
- <Pine.LNX.4.64.0604161000550.3701@g5.osdl.org>
Hi,
On Sun, 16 Apr 2006, Linus Torvalds wrote:
Show 13 quoted lines
> On Sun, 16 Apr 2006, Johannes Schindelin wrote: > > > > But you missed my point. The file log-tree.c had some opt handling. I > > changed it (as can be seen in my patch for combined diffstat), so the > > merge did not go well with next, which removed that code. > > > > So I tried to be clever and find the (non-merge) commit where this > > happened. With what you describe, I should have hit *exactly one* commit > > removing the code. > > > > But I hit *exactly none* with "git log --cc master log-tree.c". > > Do you have the tree somewhere?
I have no quick way to publish it, if you mean that.
> In the current git tree, there really _is_ just one commit that touches > log-tree.c in "master". And "git log log-tree.c" picks that out without > trouble.
It is my master. Not Junio's.
The problem seems to be that the current next does not have the code. But when I last merged, it had it. So basically, I have a problem here that I thought "git log --cc" can solve, but it doesn't.
"git log -cc" is good to find out when code *that is present now* has crept in, but it is no good to find out when code that was in commit such-and-such, and is no longer in commit such-and-that, has been culled.
Pity.
Thanks for your help, Dscho