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

From: Brett Cundal <brett.cundal@iugome.com>
Date: Jul 22, 2016, 17:15 UTC
Message-ID: <CAMaPC4+rjr3bSkKcUFipDwW6es4y9Rgq7Z-3SPz0A7qLMw77Pw@mail.gmail.com>
In-Reply-To: <alpine.DEB.2.20.1607220954470.14111@virtualbox>

On 22 July 2016 at 01:11, Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:

> I know it feels good to get frustration off of your chest by ranting. I am
> very sympathetic to that. Please note, however, that it puts the people
> who are ready to help you immediately into a defensive corner. Probably
> unintentional?

Shortest rant ever. :) Sorry if I caused any offense. It just seemed very odd to block multi-part MIME that happened to contain a text/html part in addition to text/plain, given that (AFAIK) the vast majority of email clients in recent years produce such a thing. Anyhow, off-topic... your list policy is your business.

Show 11 quoted lines

> Back to the patch you wanted to submit: since this is an important bug
> fix, I spent the time to clean it up. The only missing bit that requires
> further effort from your side is that we need your Sign-off. See
> https://github.com/git/git/blob/v2.9.2/Documentation/SubmittingPatches#L239-L291
> for an explanation. Essentially, you are stating explicitly that you are
> not legally prohibited from contributing this patch. If you can say that,
> simply reply with a
>
>         Signed-off-by: Brett Cundal <brett.cundal@iugome.com>
>
> We can take it from there by inserting it into the following patch:

So, again I'll have to apologise... I should have submitted this as a bug report rather than a patch, since the ownership is not legally clear. Didn't even occur to me for such a trivial fix. If you can just treat this as a bug report at this point and 'reimplement' it, that would probably be the simplest thing for everyone... I guess this may be tricky since there are limited ways to possibly implement this, but for the same reason it would be impossible IMO for me or anyone else to legally claim authorship of it (but IANAL). If this is going to cause this fix to be jammed in limbo for all eternity, then let me know and I'll see what I can do to get the proper authorization.

-- Brett