Re: path limiting broken
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Apr 16, 2006, 16:45 UTC
- Message-ID
- <Pine.LNX.4.63.0604161835410.17985@wbgn013.biozentrum.uni-wuerzburg.de>
- In-Reply-To
- <Pine.LNX.4.64.0604160850230.3701@g5.osdl.org>
Hi,
On Sun, 16 Apr 2006, Linus Torvalds wrote:
Show 8 quoted lines
> On Sun, 16 Apr 2006, Johannes Schindelin wrote: > > > > I am not intelligent enough to find out why there are three revisions > > which get culled. > > Path limiting by default looks at all parents of a merge, and if any of > them is identical to the child (within the path limiter), it will pick > _that_ parent, and that parent only, and drop all other parents.
That's okay.
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".
Ciao, Dscho