{"thread":{"id":"42980","subject":"git 2.9 subtree split with rejoin","startedAt":"2016-07-31T14:35:35Z","lastAt":"2016-07-31T17:33:23Z","messageCount":2,"participants":["Sylvain Garrigues","Jakub Narębski"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"292686","messageId":"1BED74C8-2E4C-4CA7-B785-F0666B69C1A7@gmail.com","threadId":"42980","inReplyTo":null,"subject":"git 2.9 subtree split with rejoin","fromName":"Sylvain Garrigues","fromEmail":"sylgar@gmail.com","sentAt":"2016-07-31T14:32:21Z","receivedAt":"2016-07-31T14:35:35Z","isPatch":false,"sender":{"key":"sylgar@gmail.com","avatar":null},"body":"Hello,\n\nIt seems now with 2.9 you cannot use git subtree split —rejoin without —onto otherwise you get:\nfatal: refusing to merge unrelated histories\n\nI wish I could pass --allow-unrelated-histories but that doesn’t work.\n\nAdding —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?\n\nThanks,\nSylvain.\n\n"},{"id":"292689","messageId":"ddf95185-0b87-b81b-6583-6e0aab5a6b5a@gmail.com","threadId":"42980","inReplyTo":"1BED74C8-2E4C-4CA7-B785-F0666B69C1A7@gmail.com","subject":"Re: git 2.9 subtree split with rejoin","fromName":"Jakub Narębski","fromEmail":"jnareb@gmail.com","sentAt":"2016-07-31T17:32:51Z","receivedAt":"2016-07-31T17:33:23Z","isPatch":false,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"W dniu 31.07.2016 o 16:32, Sylvain Garrigues pisze:\n> Hello,\n> \n> It seems now with 2.9 you cannot use git subtree split —rejoin\n> without —onto otherwise you get:\n>    fatal: refusing to merge unrelated histories\n> \n> I wish I could pass --allow-unrelated-histories but that doesn’t\n> work.\n> \n> Adding —onto makes the split operation much much longer. Could we\n> make a bug fix which allow to pass the --allow-unrelated-histories\n> flag to subtree split?\n\nThis should be soon in 'master', you can check it in 'next',\nand I think it would be present in the new release.\n\nFrom \"What's cooking in git.git (Jul 2016, #09; Fri, 29)\":\n--------------------------------------------------------------------\n[Cooking]\n\n* da/subtree-2.9-regression (2016-07-26) 2 commits\n  (merged to 'next' on 2016-07-26 at 9d71562)\n + subtree: fix \"git subtree split --rejoin\"\n + t7900-subtree.sh: fix quoting and broken && chains\n (this branch is used by da/subtree-modernize.)\n\n \"git merge\" in Git v2.9 was taught to forbid merging an unrelated\n lines of history by default, but that is exactly the kind of thing\n the \"--rejoin\" mode of \"git subtree\" (in contrib/) wants to do.\n \"git subtree\" has been taught to use the \"--allow-unrelated-histories\"\n option to override the default.\n\n Will merge to 'master'.\n\n"}]}