From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 28 Jun 2012 22:20:16 +0000 (-0700)
Subject: Merge branch 'jc/rev-list-simplify-merges-first-parent'
X-Git-Tag: v1.7.12-rc0~71
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=331512f9888b1c95f61851e678201bfafb1e9245;p=git.git

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.
---

331512f9888b1c95f61851e678201bfafb1e9245