It is unclear what it means to "simplify-merges" while traversing only the "first-parent" ancestry chain, but the combination of the options makes the simplification logic to use in-core commit objects that haven't been examined for relevance, either producing incorrect result or taking too long to produce any output. Teach the simplification logic to ignore commits that the first-parent traversal logic ignored when both are in effect to work around the issue. Junio C Hamano (3): revision: "simplify" options imply topo-order sort revision: note the lack of free() in simplify_merges() revision: ignore side parents while running simplify-merges revision.c | 41 +++++++++++++++++++++++++++++------------ 1 file changed, 29 insertions(+), 12 deletions(-) -- 1.7.11.1.29.gf71be5c -- 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