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

Re: [PATCH] git-subtree.sh: Use --allow-unrelated-histories when splitting with --rejoin

From
BCBrett Cundal <brett.cundal@iugome.com>
Date
Jul 21, 2016, 18:09 UTC
Message-ID
<CAMaPC4JTerX7TSg5_M=DOztyaGUVd5_kK8cmTJuWrCekGgSodw@mail.gmail.com>
In-Reply-To
<alpine.DEB.2.20.1607211724430.14111@virtualbox>

[re-sending as plain-text so the list software doesn't reject as spam... what decade is this?]

Hey,

Sorry about the empty commit message... there was one originally (albeit not as detailed as the pull request), but I guess it got stripped? As you have probably guessed, I have no idea how you guys do patch submission.

I'm not currently able to spend much time getting up to speed with git development just to submit this fix... I would have just filed a bug, but I couldn't figure out how (I guess it's just this mailing list?) and I figured a patch would be more useful. I had a look at writing a test initially, but I didn't see any existing tests for 'git subtree', and I'm not familiar with the test framework.

The case that fails is basically any usage of split --rejoin... e.g. make a new repo, make changes to directory a, make changes to directory b... do a 'git subtree split -P a --rejoin' and it will fail at the end when attempting to merge the split commits back to the main line, due to the two lines being unrelated (now disallowed by default in git 2.9).

Hopefully I'm not just doing something wrong - I'm surprised such a major bug has not been fixed already... I guess noone else uses --rejoin? Anyhow, this patch fixes the issue for me.

Hope that helps,
-- Brett

On 21 July 2016 at 08:25, Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:

Show 12 quoted lines
> Hi David,
>
> On Wed, 20 Jul 2016, David Aguilar wrote:
>
>> As-is, the commit itself should probably be amended to contain
>> that information [the better explanation].
>
> Definitely. Keep in mind: if this gets merged or cherry-picked elsewhere,
> the Pull Request's message is just as lost.
>
> Ciao,
> Johannes
Previous: Johannes SchindelinNext: Johannes Schindelin
Message 4 of 6 in “git-subtree.sh: Use --allow-unrelated-histories when splitting with --rejoin”
  1. git-subtree.sh: Use --allow-unrelated-histories when splitting with --rejoinBrett Cundal, Jul 21, 2016
  2. David AguilarJul 21, 2016
  3. Johannes SchindelinJul 21, 2016
  4. Brett CundalJul 21, 2016
  5. Johannes SchindelinJul 22, 2016
  6. Brett CundalJul 22, 2016

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.