Re: [PATCH 2/2] combine-diff: speed it up, by using multiparent diff tree-walker directly

On Thu, Feb 13, 2014 at 11:55:08AM -0800, Junio C Hamano wrote: Kirill Smelkov k...@mns.spb.ru writes: + if (need_generic_pathscan) { + /* NOTE generic case also handles --stat, as it computes +* diff(sha1,parent_i) for all i to do the job, specifically +

[PATCH 2/2] combine-diff: speed it up, by using multiparent diff tree-walker directly

As was recently shown (c839f1bd combine-diff: optimize combine_diff_path sets intersection), combine-diff runs very slowly. In that commit we optimized paths sets intersection, but that accounted only for ~ 25% of the slowness, and as my tracing showed, for linux.git v3.10..v3.11, for merges a lot

Re: [PATCH 2/2] combine-diff: speed it up, by using multiparent diff tree-walker directly

Kirill Smelkov k...@mns.spb.ru writes: + if (need_generic_pathscan) { + /* NOTE generic case also handles --stat, as it computes + * diff(sha1,parent_i) for all i to do the job, specifically + * for parent0. + */ + paths =