From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Subject: [PATCH v2 0/3] "log --first-parent --simplify-merges/by-decoration"
Date: Fri, 22 Jun 2012 15:27:37 -0700 [thread overview]
Message-ID: <1340404061-11619-1-git-send-email-gitster@pobox.com> (raw)
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
next reply other threads:[~2012-06-22 22:27 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-22 22:27 Junio C Hamano [this message]
2012-06-22 22:27 ` [PATCH v2 1/3] revision: "simplify" options imply topo-order sort Junio C Hamano
2012-06-22 22:27 ` [PATCH v2 2/3] revision: note the lack of free() in simplify_merges() Junio C Hamano
2012-06-22 22:27 ` [PATCH v2 3/3] revision: ignore side parents while running simplify-merges Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1340404061-11619-1-git-send-email-gitster@pobox.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).