{"thread":{"id":"56003","subject":"Re: subtree split includes unrelated commits","startedAt":"2021-06-25T00:58:24Z","lastAt":"2021-06-25T01:09:20Z","messageCount":2,"participants":["Douglas Leonard"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"428450","messageId":"CADdMKP8kY-ry4ZWmp1hLCne328cC4thgavbkXOjdaNpD_ockSg@mail.gmail.com","threadId":"56003","inReplyTo":null,"subject":"Re: subtree split includes unrelated commits","fromName":"Douglas Leonard","fromEmail":"dleonard.dev@gmail.com","sentAt":"2021-06-25T00:58:04Z","receivedAt":"2021-06-25T00:58:24Z","isPatch":false,"sender":{"key":"dleonard.dev@gmail.com","avatar":null},"body":"I hope I got this reply sent to the right thread.\n\n> I found the issue to be related with the following change in git-subtree.sh:\n\n> > Revision: 933cfeb90b5d03b4096db6d60494a6eedea25d03\n> > Author: Dave Ware <davidw@realtimegenomics.com>\n> > Date: 15.01.2016 01:41:43\n> > Message:\n> > contrib/subtree: fix \"subtree split\" skipped-merge bug\n\n> > 'git subtree split' can incorrectly skip a merge even when both parents\n> > act on the subtree, provided the merge results in a tree identical to\n> > one of the parents. Fix by copying the merge if at least one parent is\n> > non-identical, and the non-identical parent is not an ancestor of the\n> > identical parent.\n\nHmm... I'm not expert on the implementation details of subtree split.\nBut I wonder if this should have said \"if at least one parent is\nnon-subtree-identical\"?  Maybe that's what was meant. I just went\nthrough writing a similar \"degenerate  merge\" (to adopt the\nfilter-repo terminology for it) detection for git-alltrees, although\nI'm not sure alltrees would handle this particular case to your liking\neither.  I think I discard merges if either parent is\nsubtree-identical to the merge commit, probably keeping only the\nmatching branch, but I'm not sure that's always true, and that's\nthere, not here.\n\nCheers,\nDoug\n"},{"id":"428451","messageId":"CADdMKP-vTfbkdxcK5ZN2TJh3fVPc7hydqDNqBp8V6Jr-J6F+mA@mail.gmail.com","threadId":"56003","inReplyTo":"CADdMKP8kY-ry4ZWmp1hLCne328cC4thgavbkXOjdaNpD_ockSg@mail.gmail.com","subject":"Re: subtree split includes unrelated commits","fromName":"Douglas Leonard","fromEmail":"dleonard.dev@gmail.com","sentAt":"2021-06-25T01:09:01Z","receivedAt":"2021-06-25T01:09:20Z","isPatch":false,"sender":{"key":"dleonard.dev@gmail.com","avatar":null},"body":">\n> I hope I got this reply sent to the right thread.\n>\n\nOops, probably forgetting the Re broke that.\n"}]}