Merge branch 'jc/rev-list-simplify-merges-first-parent' into maint
commitc8382c1500be51a869eb87feb00210c8d5a05a31
authorJunio C Hamano <gitster@pobox.com>
Wed, 11 Jul 2012 19:46:57 +0000 (11 12:46 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 11 Jul 2012 19:46:57 +0000 (11 12:46 -0700)
tree70dd4f7a10e3b89a86aa3bd78ae71c394a8f55b4
parenta101eb41fb3319e5f0e2e12206cf2d87aab72f0f
parent6e513ba3a624a57fcf9e0f316ba54b3e0c951286
Merge branch 'jc/rev-list-simplify-merges-first-parent' into maint

When "git log" gets "--simplify-merges/by-decoration" together with
"--first-parent", 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.

* jc/rev-list-simplify-merges-first-parent:
  revision: ignore side parents while running simplify-merges
  revision: note the lack of free() in simplify_merges()
  revision: "simplify" options imply topo-order sort
revision.c