From: Junio C Hamano Date: Tue, 11 Feb 2014 19:59:02 GMT Subject: Re: [PATCH 00/11] More preparatory work for multiparent tree-walker Message-ID: In-Reply-To: <20140211081716.GA4455@tugrik.mns.mnsspb.ru> Kirill Smelkov writes: > Sorry for the confusion. Could you please do the following: > > Patches should be applied over to ks/tree-diff-walk > (74aa4a18). Before applying the patches, please cherry-pick > > c90483d9 (tree-diff: no need to manually verify that there is no > mode change for a path) > > ef4f0928 (tree-diff: no need to pass match to > skip_uninteresting()) > > into that branch, and drop them from ks/combine-diff - we'll have one > branch reworking the diff tree-walker, and the other taking advantage of > it for combine-diff. As long as that does not lose changes to tests and clean-ups, I'm fine with that direction. For example, I do not know if you want to lose e3f62d12 (diffcore-order: export generic ordering interface, 2014-01-20), which is part of the combine-diff topic.