From: Derrick Stolee <stolee@gmail.com>
To: Junio C Hamano <gitster@pobox.com>,
Derrick Stolee via GitGitGadget <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, peff@peff.net, me@ttaylorr.com,
Derrick Stolee <dstolee@microsoft.com>
Subject: Re: [PATCH] revision: --include-diversions adds helpful merges
Date: Tue, 7 Apr 2020 21:39:50 -0400 [thread overview]
Message-ID: <5f1c6868-303c-ccc1-553e-e54d0fa8e24f@gmail.com> (raw)
In-Reply-To: <xmqqv9mapxw9.fsf@gitster.c.googlers.com>
On 4/7/2020 9:30 PM, Junio C Hamano wrote:
> "Derrick Stolee via GitGitGadget" <gitgitgadget@gmail.com> writes:
>
>> This --include-diversions option could use a better name.
>
> True, but I do not think of a better (or for that matter a worse)
> one.
>
> As a new feature, I think this is a reasonable thing to want,
> especially it is in line with the push in the past few years to
> treat the first parent history specially.
>
> I wonder how this would interact with the ancestry-path option?
> That one also, like the simplify-merges option, needs a limited
> traversal, and if this new mode can do without a limited traversal
> (in other words, the output can be done incrementally from the tip)
> and achieve something similar to what these other options wanted to
> show, that would be great.
You're right. I briefly considered the --ancestry-path option before
realizing that would get a huge set of commits (for example: every
topic based on the branch after the pull request was merged).
The --include-diversions works incrementally like simplified merges.
Based on the implementation, it would not change the results when
added to a --full-history query. This makes sense: a diversion would
appear in the --full-history results, anyway.
It is worth adding tests for the combination with --ancestry-path
and --simplify-merges, as the --include-diversions option would
add results to those queries.
Thanks,
-Stolee
next prev parent reply other threads:[~2020-04-08 1:39 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-08 1:22 [PATCH] revision: --include-diversions adds helpful merges Derrick Stolee via GitGitGadget
2020-04-08 1:30 ` Junio C Hamano
2020-04-08 1:39 ` Derrick Stolee [this message]
2020-04-08 15:28 ` Derrick Stolee
2020-04-08 19:46 ` Junio C Hamano
2020-04-08 20:05 ` Jeff King
2020-04-08 20:22 ` Derrick Stolee
2020-04-08 21:35 ` Junio C Hamano
2020-04-08 23:59 ` Derrick Stolee
2020-04-09 0:08 ` Junio C Hamano
2020-04-09 11:52 ` Derrick Stolee
2020-04-09 14:28 ` Philip Oakley
2020-04-09 15:56 ` Junio C Hamano
2020-04-09 17:20 ` Derrick Stolee
2020-04-09 18:24 ` Jeff King
2020-04-09 18:55 ` Junio C Hamano
2020-04-09 19:21 ` Jeff King
2020-04-08 2:13 ` brian m. carlson
2020-04-08 18:48 ` Jeff King
2020-04-09 0:01 ` [PATCH v2] " Derrick Stolee via GitGitGadget
2020-04-10 12:19 ` [PATCH v3] revision: --show-pulls " Derrick Stolee via GitGitGadget
2020-04-10 20:06 ` Junio C Hamano
2020-04-10 21:43 ` Derrick Stolee
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=5f1c6868-303c-ccc1-553e-e54d0fa8e24f@gmail.com \
--to=stolee@gmail.com \
--cc=dstolee@microsoft.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=me@ttaylorr.com \
--cc=peff@peff.net \
/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).