Re: git rebase --skip stuck in a loop
- From
brian m. carlson <sandals@crustytoothpaste.net>
- Date
- Jun 15, 2014, 22:39 UTC
- Message-ID
- <20140615223913.GI368384@vauxhall.crustytoothpaste.net>
- In-Reply-To
- <539B0795.70907@ubuntu.com>
On Fri, Jun 13, 2014 at 10:15:49AM -0400, Phillip Susi wrote:
Show 14 quoted lines
> -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA1 > > On 6/13/2014 3:34 AM, Jeff King wrote: > > Thanks for saving the stuck state. > > > > If it's possible to share the whole repo, it might be worth seeing > > (then we can all just run "git rebase --continue" ourselves). If > > it's too big or is confidential, just tarring up .git/rebase-apply > > and making it available is probably a good first step. > > It's the debian parted repo, so nothing confidential. Here it is: > > https://drive.google.com/file/d/0ByOQJBpP4bDXXy13YlN0aE5Fcnc/edit?usp=sharing
Okay. This is actually a fairly straightforward issue. In order to reproduce, you have to use git rebase --merge and two patches in sequence have to cause conflicts. In that case, git rebase --skip will fail to ever update the msgnum value, and it will get caught in a loop.
I should have a patch shortly.
-- brian m. carlson / brian with sandals: Houston, Texas, US +1 832 623 2791 | http://www.crustytoothpaste.net/~bmc | My opinion only OpenPGP: RSA v4 4096b: 88AC E9B2 9196 305B A994 7552 F1BA 225C 0223 B187