git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: git rebase --skip stuck in a loop

From
PSPhillip Susi <psusi@ubuntu.com>
Date
Jun 13, 2014, 01:16 UTC
Message-ID
<539A50F2.40206@ubuntu.com>
In-Reply-To
<20140613010256.GD368384@vauxhall.crustytoothpaste.net>
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
On 06/12/2014 09:02 PM, brian m. carlson wrote:
Show 10 quoted lines
> 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 reproduce this?
> 
> If you can get that information, I'm interested in trying to fix
> it.

I don't have a set of reproduction steps, but I do still have the repo that is in this stuck state if there is any data you might want me to pull out of it ( .git/rebase-apply? ).

I had spoken to another Ubuntu dev who said that he had this happen to him once too and he just did an abort and tried again and the problem went away, so it seems hard to reproduce, which is why I have preserved the problem to try and analyze it.

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQEcBAEBCgAGBQJTmlDyAAoJEI5FoCIzSKrwN0IH/R6ny2h1XLv3Rj2Aed6C8xzU +XsiNo6RYG9++Jk3vr705CVnmWx+4lwhr7E6jW9ValdDKEYjamypeQUyqrWSokiH IajIMc4BNowGW7Eg1uRV8KQfb1P+QtmxBMwumOnOYk9zPfA9JcmlPVT6g5LrKy9N 6TMIlCMY1v0WPKZhseYYWHayP8PHF8KqSVuGIAZoPKPQdOQjNAOLW+PPbxiQKCcB PrspPx+hNk4NUUm8156BdJO+xEGQpSYIY384yo0dEfvh3QHB4z/wTv84/9APxEQO rV+67fW1psrFX+GkUolL9WFCBOeZRk3nykYJRravSOuOJKBa9laGAmiJT/EjWYI= =DONL -----END PGP SIGNATURE-----

Previous: brian m. carlsonNext: Jeff King
Message 4 of 9 in “git rebase --skip stuck in a loop”
  1. Phillip SusiJun 10, 2014
  2. Phillip SusiJun 12, 2014
  3. brian m. carlsonJun 13, 2014
  4. Phillip SusiJun 13, 2014
  5. Jeff KingJun 13, 2014
  6. Phillip SusiJun 13, 2014
  7. brian m. carlsonJun 15, 2014
  8. rebase--merge: fix --skip with two conflicts in a rowbrian m. carlson, Jun 16, 2014
  9. Junio C HamanoJun 16, 2014

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.