# Find successor of common ancestor 7 messages from 2010-07-16 to 2010-07-16. Participants: Enrico Weigelt, Santi Béjar, Johan Herland, Andreas Schwab, Avery Pennarun. Thread: https://gitlist.dev/t/24411 ## Enrico Weigelt, 2010-07-16 08:29 Subject: Find successor of common ancestor Message-ID: <20100716082937.GA22894@nibiru.local> URL: https://gitlist.dev/e/20100716082937.GA22894%40nibiru.local ``` Hi folks, suppose the following situation: I've forked some branch A into B, now A and B have evolved independently for quite some time into A' and B'. Now I'd like to rebase B' along A' history line step by step - first on A+1, then A+3, ... until A' (that's what I'd call zip-rebase). For this I need to find out the successor commit A (along the A' history line). Does anyone know how to do that ? cu -- ---------------------------------------------------------------------- Enrico Weigelt, metux IT service -- http://www.metux.de/ phone: +49 36207 519931 email: weigelt@metux.de mobile: +49 151 27565287 icq: 210169427 skype: nekrad666 ---------------------------------------------------------------------- Embedded-Linux / Portierung / Opensource-QM / Verteilte Systeme ---------------------------------------------------------------------- ``` ## Santi Béjar, 2010-07-16 08:49 Subject: Re: Find successor of common ancestor Message-ID: URL: https://gitlist.dev/e/AANLkTintIToGZu3fvK4aE5LFL7MgOnlfwKgsZ79Q0-o1%40mail.gmail.com In-Reply-To: <20100716082937.GA22894@nibiru.local> ``` On Fri, Jul 16, 2010 at 10:29 AM, Enrico Weigelt wrote: > > Hi folks, > > > suppose the following situation: > > I've forked some branch A into B, now A and B have evolved > independently for quite some time into A' and B'. Now I'd like > to rebase B' along A' history line step by step - first on A+1, > then A+3, ... until A' (that's what I'd call zip-rebase). This is just what "git rebase" does: $ git checkout B' $ git rebase A' HTH, Santi ``` ## Enrico Weigelt, 2010-07-16 09:06 Subject: Re: Find successor of common ancestor Message-ID: <20100716090613.GB22894@nibiru.local> URL: https://gitlist.dev/e/20100716090613.GB22894%40nibiru.local In-Reply-To: ``` * Santi Béjar wrote: > On Fri, Jul 16, 2010 at 10:29 AM, Enrico Weigelt wrote: > > > > Hi folks, > > > > > > suppose the following situation: > > > > I've forked some branch A into B, now A and B have evolved > > independently for quite some time into A' and B'. Now I'd like > > to rebase B' along A' history line step by step - first on A+1, > > then A+3, ... until A' (that's what I'd call zip-rebase). > > This is just what "git rebase" does: > > $ git checkout B' > $ git rebase A' Yes, but I need to find out A+1 for my zip-rebase. cu -- ---------------------------------------------------------------------- Enrico Weigelt, metux IT service -- http://www.metux.de/ phone: +49 36207 519931 email: weigelt@metux.de mobile: +49 151 27565287 icq: 210169427 skype: nekrad666 ---------------------------------------------------------------------- Embedded-Linux / Portierung / Opensource-QM / Verteilte Systeme ---------------------------------------------------------------------- ``` ## Johan Herland, 2010-07-16 12:19 Subject: Re: Find successor of common ancestor Message-ID: <201007161419.39469.johan@herland.net> URL: https://gitlist.dev/e/201007161419.39469.johan%40herland.net In-Reply-To: <20100716090613.GB22894@nibiru.local> ``` On Friday 16 July 2010, Enrico Weigelt wrote: > * Santi Béjar wrote: > > On Fri, Jul 16, 2010 at 10:29 AM, Enrico Weigelt wrote: > > > Hi folks, > > > > > > > > > suppose the following situation: > > > > > > I've forked some branch A into B, now A and B have evolved > > > independently for quite some time into A' and B'. Now I'd like > > > to rebase B' along A' history line step by step - first on A+1, > > > then A+3, ... until A' (that's what I'd call zip-rebase). > > > > This is just what "git rebase" does: > > > > $ git checkout B' > > $ git rebase A' > > Yes, but I need to find out A+1 for my zip-rebase. IINM you have the following situation A0---A1---A2---A3---A4 <-- A' \ B1---B2---B3--B4 <-- B' ...and you want to rebase B' (i.e. B1 through B4), first onto A1, then onto A2, the onto A3, and finally onto A4. I have no idea WHY you would want to do this (rebasing directly onto A4 (like Santi suggests) is much cheaper), but you can certainly coax Git into doing it, anyway. To list commits A1, A2, A3, A4 (in that order), do: git rev-list --reverse B'..A' You can now loop over the results like this: git checkout B' for a in $(git rev-list --reverse ..A'); do git rebase $a done Hope this helps, ...Johan -- Johan Herland, www.herland.net ``` ## Andreas Schwab, 2010-07-16 12:29 Subject: Re: Find successor of common ancestor Message-ID: URL: https://gitlist.dev/e/m2aaprr4ny.fsf%40igel.home In-Reply-To: <20100716090613.GB22894@nibiru.local> ``` Enrico Weigelt writes: > * Santi Béjar wrote: >> On Fri, Jul 16, 2010 at 10:29 AM, Enrico Weigelt wrote: >> > >> > Hi folks, >> > >> > >> > suppose the following situation: >> > >> > I've forked some branch A into B, now A and B have evolved >> > independently for quite some time into A' and B'. Now I'd like >> > to rebase B' along A' history line step by step - first on A+1, >> > then A+3, ... until A' (that's what I'd call zip-rebase). >> >> This is just what "git rebase" does: >> >> $ git checkout B' >> $ git rebase A' > > Yes, but I need to find out A+1 for my zip-rebase. git rev-list [--first-parent] A..A' | tac | while read rev; do git rebase $rev; done Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different." ``` ## Enrico Weigelt, 2010-07-16 15:35 Subject: Re: Find successor of common ancestor Message-ID: <20100716153544.GC22894@nibiru.local> URL: https://gitlist.dev/e/20100716153544.GC22894%40nibiru.local In-Reply-To: <201007161419.39469.johan@herland.net> ``` * Johan Herland wrote: > IINM you have the following situation > > A0---A1---A2---A3---A4 <-- A' > \ > B1---B2---B3--B4 <-- B' > > ...and you want to rebase B' (i.e. B1 through B4), first onto A1, then > onto A2, the onto A3, and finally onto A4. I have no idea WHY you would > want to do this (rebasing directly onto A4 (like Santi suggests) is > much cheaper), but you can certainly coax Git into doing it, anyway. If the branches go off too far, you can easily end up in a lot of unresolvable conflicts, while on zip-rebase, there's great chance that 3way-merge will catch this. > To list commits A1, A2, A3, A4 (in that order), do: > > git rev-list --reverse B'..A' > > You can now loop over the results like this: > > git checkout B' > for a in $(git rev-list --reverse ..A'); do > git rebase $a > done Thx, I'll have a try :) cu -- ---------------------------------------------------------------------- Enrico Weigelt, metux IT service -- http://www.metux.de/ phone: +49 36207 519931 email: weigelt@metux.de mobile: +49 151 27565287 icq: 210169427 skype: nekrad666 ---------------------------------------------------------------------- Embedded-Linux / Portierung / Opensource-QM / Verteilte Systeme ---------------------------------------------------------------------- ``` ## Avery Pennarun, 2010-07-16 15:44 Subject: Re: Find successor of common ancestor Message-ID: URL: https://gitlist.dev/e/AANLkTiloDCX4SuEDe_BNivv3UkY2TrQU1EAZlZGd1HYs%40mail.gmail.com In-Reply-To: <20100716082937.GA22894@nibiru.local> ``` On Fri, Jul 16, 2010 at 4:29 AM, Enrico Weigelt wrote: > I've forked some branch A into B, now A and B have evolved > independently for quite some time into A' and B'. Now I'd like > to rebase B' along A' history line step by step - first on A+1, > then A+3, ... until A' (that's what I'd call zip-rebase). You haven't *really* explained what you want to do here, but that doesn't really effect the answer to your actual question... > For this I need to find out the successor commit A (along the A' > history line). Does anyone know how to do that ? git rev-list --first-parent --reverse $(git merge-base A B)..A Have fun, Avery ```