From: Brett Cundal <brett.cundal@iugome.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: David Aguilar <davvid@gmail.com>,
git@vger.kernel.org, Roberto Tyley <roberto.tyley@gmail.com>
Subject: Re: [PATCH] git-subtree.sh: Use --allow-unrelated-histories when splitting with --rejoin
Date: Thu, 21 Jul 2016 11:09:32 -0700 [thread overview]
Message-ID: <CAMaPC4JTerX7TSg5_M=DOztyaGUVd5_kK8cmTJuWrCekGgSodw@mail.gmail.com> (raw)
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:
> 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
next prev parent reply other threads:[~2016-07-21 18:09 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-21 0:56 [PATCH] git-subtree.sh: Use --allow-unrelated-histories when splitting with --rejoin Brett Cundal
2016-07-21 5:26 ` David Aguilar
2016-07-21 15:25 ` Johannes Schindelin
2016-07-21 18:09 ` Brett Cundal [this message]
2016-07-22 8:11 ` Johannes Schindelin
2016-07-22 17:15 ` Brett Cundal
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAMaPC4JTerX7TSg5_M=DOztyaGUVd5_kK8cmTJuWrCekGgSodw@mail.gmail.com' \
--to=brett.cundal@iugome.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=roberto.tyley@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).