Re: git rebase --skip stuck in a loop

2014-06-15 Thread brian m. carlson
On Fri, Jun 13, 2014 at 10:15:49AM -0400, Phillip Susi wrote: > -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 ru

Re: git rebase --skip stuck in a loop

2014-06-13 Thread Phillip Susi
-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, ju

Re: git rebase --skip stuck in a loop

2014-06-13 Thread Jeff King
On Thu, Jun 12, 2014 at 09:16:34PM -0400, Phillip Susi wrote: > > I'm assuming this works in the general case, because we have tests > > for it. Do you perhaps have a repository and a set of reproduction > > steps we could use to try to reproduce this? > > > > If you can get that information, I'

Re: git rebase --skip stuck in a loop

2014-06-12 Thread Phillip Susi
-BEGIN PGP SIGNED MESSAGE- Hash: SHA512 On 06/12/2014 09:02 PM, brian m. carlson wrote: > On Thu, Jun 12, 2014 at 05:01:16PM -0400, Phillip Susi wrote: >> So nobody has any ideas on what to check for or how to debug >> this? > > I'm assuming this works in the general case, because we have

Re: git rebase --skip stuck in a loop

2014-06-12 Thread brian m. carlson
On Thu, Jun 12, 2014 at 05:01:16PM -0400, Phillip Susi wrote: > So nobody has any ideas on what to check for or how to debug this? I'm assuming this works in the general case, because we have tests for it. Do you perhaps have a repository and a set of reproduction steps we could use to try to rep

Re: git rebase --skip stuck in a loop

2014-06-12 Thread Phillip Susi
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 So nobody has any ideas on what to check for or how to debug this? On 6/10/2014 2:57 PM, Phillip Susi wrote: > I'm in the middle of a long rebase and have had no trouble with > git rebase --skip several times, but now it has become stuck: > > psusi@d

git rebase --skip stuck in a loop

2014-06-10 Thread Phillip Susi
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 I'm in the middle of a long rebase and have had no trouble with git rebase --skip several times, but now it has become stuck: psusi@devserv:~/parted.git$ git rebase --skip Auto-merging libparted/arch/linux.c CONFLICT (content): Merge conflict in lib