Hello up there, I'm using `git log --raw` to reconstruct file dates (readonly filesystem for git archives) and, as it turned out, for --raw to emit diffs for merges we need to explicitly activate combine-diff via -c. The combined-diff turned out to be slow, I'm trying to optimize it. Please apply. Thanks beforehand, Kirill Kirill Smelkov (4): diffcore-order: Export generic ordering interface diff test: Add tests for combine-diff with orderfile combine-diff: Optimize combine_diff_path sets intersection combine-diff: combine_diff_path.len is not needed anymore combine-diff.c | 121 +++++++++++++++++++++++++++++++++----------------- diff-lib.c | 2 - diff.h | 1 - diffcore-order.c | 53 ++++++++++++++-------- diffcore.h | 15 +++++++ t/t4056-diff-order.sh | 21 +++++++++ 6 files changed, 151 insertions(+), 62 deletions(-) -- 1.9.rc0.143.g6fd479e -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html