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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



[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@xxxxxx> wrote:
> 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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]