Re: [PATCH 0/4] diff --cc: relax path filtering

2015-04-03 Thread Max Kirillov
On Thu, Apr 02, 2015 at 05:13:10PM -0400, Jeff King wrote: On Thu, Apr 02, 2015 at 11:34:09PM +0300, Max Kirillov wrote: For diff --cc, paths fitering used to select only paths which have changed in all parents, while diffing itself output hunks which are changed in as few as 2 parents.

[PATCH 0/4] diff --cc: relax path filtering

2015-04-02 Thread Max Kirillov
For diff --cc, paths fitering used to select only paths which have changed in all parents, while diffing itself output hunks which are changed in as few as 2 parents. Fix intersect_paths() to add paths which have at least 2 changed parents. Intersects with branch 'bc/object-id' which is not yet

Re: [PATCH 0/4] diff --cc: relax path filtering

2015-04-02 Thread Jeff King
On Thu, Apr 02, 2015 at 11:34:09PM +0300, Max Kirillov wrote: For diff --cc, paths fitering used to select only paths which have changed in all parents, while diffing itself output hunks which are changed in as few as 2 parents. I'm confused about used to here. Is this a regression due to the