From: Thomas Rast <trast@inf.ethz.ch>
To: Francis Moreau <francis.moro@gmail.com>
Cc: "git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: Splitting a rev list into 2 sets
Date: Mon, 24 Jun 2013 11:59:24 +0200 [thread overview]
Message-ID: <87mwqf3k3n.fsf@linux-k42r.v.cablecom.net> (raw)
In-Reply-To: <CAC9WiBgb18ZX0vr8V79tCEUStrDRhRiSh44nH6+3B_Kf8rypYg@mail.gmail.com> (Francis Moreau's message of "Thu, 20 Jun 2013 18:24:10 +0200")
Francis Moreau <francis.moro@gmail.com> writes:
> On Thu, Jun 20, 2013 at 3:20 PM, Thomas Rast <trast@inf.ethz.ch> wrote:
>> positive=$(git rev-parse "$@" | grep -v '^\^')
>> negative=$(git rev-parse "$@" | grep '^\^')
>> boundary=$(git rev-list --boundary $positive ^master | sed -n 's/^-//p')
>> # the intersection is
>> git rev-list $boundary $negative
>
> I think there's a minor issue here, when boundary is empty. Please
> correct me if I'm wrong but I think it can only happen if positive is
> simply master or a subset of master. In that case I think the solution
> is just make boundary equal to positive:
>
> # the intersection is
> git rev-list ${boundary:-$positive} $negative
>
> Now I'm going to see if that solution is faster than the initial one.
Jan "jast" Krüger pointed out on #git that
git log $(git merge-base --all A B)
is exactly the set of commits reachable from both A and B; so there's
your intersection operator :-)
So it would seem that a much simpler approach is
git rev-list $(git merge-base --all master $positive) --not $negative
avoiding the boundary handling and special-case. It relies on the
(weird?) property that $(git merge-base --all A B1 B2 ...) shows the
merge bases of A with a hypothetical merge of B1, B2, ..., which is just
what you need here.
--
Thomas Rast
trast@{inf,student}.ethz.ch
next prev parent reply other threads:[~2013-06-24 9:59 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-20 10:14 Splitting a rev list into 2 sets Francis Moreau
2013-06-20 11:26 ` Ramkumar Ramachandra
2013-06-20 13:12 ` Francis Moreau
2013-06-20 13:47 ` Ramkumar Ramachandra
2013-06-21 7:15 ` Francis Moreau
2013-06-21 7:19 ` Ramkumar Ramachandra
2013-06-20 13:04 ` Phil Hord
2013-06-20 13:17 ` Francis Moreau
2013-06-20 13:20 ` Thomas Rast
2013-06-20 16:24 ` Francis Moreau
2013-06-24 9:59 ` Thomas Rast [this message]
2013-06-25 8:09 ` Francis Moreau
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=87mwqf3k3n.fsf@linux-k42r.v.cablecom.net \
--to=trast@inf.ethz.ch \
--cc=francis.moro@gmail.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.
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).