* git 2.9 subtree split with rejoin
@ 2016-07-31 14:32 Sylvain Garrigues
2016-07-31 17:32 ` Jakub Narębski
0 siblings, 1 reply; 2+ messages in thread
From: Sylvain Garrigues @ 2016-07-31 14:32 UTC (permalink / raw)
To: git
Hello,
It seems now with 2.9 you cannot use git subtree split —rejoin without —onto otherwise you get:
fatal: refusing to merge unrelated histories
I wish I could pass --allow-unrelated-histories but that doesn’t work.
Adding —onto makes the split operation much much longer. Could we make a bug fix which allow to pass the --allow-unrelated-histories flag to subtree split?
Thanks,
Sylvain.
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: git 2.9 subtree split with rejoin
2016-07-31 14:32 git 2.9 subtree split with rejoin Sylvain Garrigues
@ 2016-07-31 17:32 ` Jakub Narębski
0 siblings, 0 replies; 2+ messages in thread
From: Jakub Narębski @ 2016-07-31 17:32 UTC (permalink / raw)
To: Sylvain Garrigues, git; +Cc: Junio C Hamano
W dniu 31.07.2016 o 16:32, Sylvain Garrigues pisze:
> Hello,
>
> It seems now with 2.9 you cannot use git subtree split —rejoin
> without —onto otherwise you get:
> fatal: refusing to merge unrelated histories
>
> I wish I could pass --allow-unrelated-histories but that doesn’t
> work.
>
> Adding —onto makes the split operation much much longer. Could we
> make a bug fix which allow to pass the --allow-unrelated-histories
> flag to subtree split?
This should be soon in 'master', you can check it in 'next',
and I think it would be present in the new release.
From "What's cooking in git.git (Jul 2016, #09; Fri, 29)":
--------------------------------------------------------------------
[Cooking]
* da/subtree-2.9-regression (2016-07-26) 2 commits
(merged to 'next' on 2016-07-26 at 9d71562)
+ subtree: fix "git subtree split --rejoin"
+ t7900-subtree.sh: fix quoting and broken && chains
(this branch is used by da/subtree-modernize.)
"git merge" in Git v2.9 was taught to forbid merging an unrelated
lines of history by default, but that is exactly the kind of thing
the "--rejoin" mode of "git subtree" (in contrib/) wants to do.
"git subtree" has been taught to use the "--allow-unrelated-histories"
option to override the default.
Will merge to 'master'.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-07-31 17:33 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-07-31 14:32 git 2.9 subtree split with rejoin Sylvain Garrigues
2016-07-31 17:32 ` Jakub Narębski
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).