From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Cc: Vincent van Ravesteijn <vfr@lyx.org>
Subject: [PATCH 0/3] rev-list --simplify-{merges,by-decoration} --first-parent
Date: Fri, 8 Jun 2012 15:53:26 -0700 [thread overview]
Message-ID: <1339196009-14555-1-git-send-email-gitster@pobox.com> (raw)
The deeper history simplification using merge information (not to be
confused with "merge simplification") was not prepared to be used
with the --first-parent option, but it was possible to trigger this
combination from gitk.
The fix is fairly straight-forward. When showing only first-parent
chain of history, the later parents won't matter in the result, so
we can just rewrite the parents and make the history a single strand
of pearls.
Showing first-parent-only history and then attempting to simplify
merges does not make much sense, but simplify-by-decoration may be a
valid thing to ask.
Junio C Hamano (3):
revision: "simplify" options imply topo-order sort
revision: note the lack of free() in simplify_merges()
revision: cull side parents before running simplify-merges
revision.c | 30 +++++++++++++++++++++---------
1 file changed, 21 insertions(+), 9 deletions(-)
--
1.7.11.rc2.29.g85b30f3
next reply other threads:[~2012-06-08 22:54 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-08 22:53 Junio C Hamano [this message]
2012-06-08 22:53 ` [PATCH 1/3] revision: "simplify" options imply topo-order sort Junio C Hamano
2012-06-08 22:53 ` [PATCH 2/3] revision: note the lack of free() in simplify_merges() Junio C Hamano
2012-06-08 22:53 ` [PATCH 3/3] revision: cull side parents before 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1339196009-14555-1-git-send-email-gitster@pobox.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=vfr@lyx.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).