git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Splitting a rev list into 2 sets

From
FMFrancis Moreau <francis.moro@gmail.com>
Date
Jun 25, 2013, 08:09 UTC
Message-ID
<CAC9WiBiEtygQGB7JAo5mWuetFE_WTZOYDaTTKv_bkbWQs8xe8A@mail.gmail.com>
In-Reply-To
<87mwqf3k3n.fsf@linux-k42r.v.cablecom.net>
Hello Thomas,
On Mon, Jun 24, 2013 at 11:59 AM, Thomas Rast <trast@inf.ethz.ch> wrote:
Show 25 quoted lines
> 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 :-)
nice :)
Show 9 quoted lines
>
> 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.
Thank you Thomas, that's exactly what I was asking for :)

-- Francis

Previous: Thomas Rast
Message 12 of 12 in “Splitting a rev list into 2 sets”
  1. Francis MoreauJun 20, 2013
  2. Ramkumar RamachandraJun 20, 2013
  3. Francis MoreauJun 20, 2013
  4. Ramkumar RamachandraJun 20, 2013
  5. Francis MoreauJun 21, 2013
  6. Ramkumar RamachandraJun 21, 2013
  7. Phil HordJun 20, 2013
  8. Francis MoreauJun 20, 2013
  9. Thomas RastJun 20, 2013
  10. Francis MoreauJun 20, 2013
  11. Thomas RastJun 24, 2013
  12. Francis MoreauJun 25, 2013

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.