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

Re: A possible subtree split bug

From
greened@obbligato.org <greened@obbligato.org>
Date
Aug 21, 2012, 01:48 UTC
Message-ID
<87boi5f21u.fsf@waller.obbligato.org>
In-Reply-To
<5017BFB0.9070701@gmail.com>
Fabien POTENCIER <fabien.potencier@gmail.com> writes:
Show 13 quoted lines
> According to the docs:
>
> "Repeated splits of exactly the same history are
> guaranteed to be identical (ie. to produce the same
> commit ids).  Because of this, if you add new commits
> and then re-split, the new commits will be attached as
> commits on top of the history you generated last time..."
>
> But unfortunately, that's not always the case.
>
> I've found that if you have a commit that reverts the previous one and
> then merge a branch where those two commits did not exist, then the
> next time you split, they won't be present anymore in the split tree.

I'm not entirely sure that they history *should* be the same in the presence of a merge. It's certainly not the same history as when the original split was done so I don't think guarantee holds.

                          -Dave
Previous: Fabien POTENCIER
Message 2 of 2 in “A possible subtree split bug”
  1. Fabien POTENCIERJul 31, 2012
  2. greened@obbligato.orgAug 21, 2012

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.