Merge branch 'jc/rev-list-simplify-merges-first-parent'
commit331512f9888b1c95f61851e678201bfafb1e9245
authorJunio C Hamano <gitster@pobox.com>
Thu, 28 Jun 2012 22:20:16 +0000 (28 15:20 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 28 Jun 2012 22:20:16 +0000 (28 15:20 -0700)
tree08531a63c00c1f2f64609730fd5e1f436c5cb90d
parent72fd7d82d7ff84343f8958f8450e35b6aa6ea80b
parent6e513ba3a624a57fcf9e0f316ba54b3e0c951286
Merge branch 'jc/rev-list-simplify-merges-first-parent'

When "--simplify-merges/by-decoration" is given together with
"--first-parent" to "git log", the combination of these 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.
revision.c