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

Re: git rebase --skip stuck in a loop

From
Jeff King <peff@peff.net>
Date
Jun 13, 2014, 07:34 UTC
Message-ID
<20140613073446.GF7908@sigill.intra.peff.net>
In-Reply-To
<539A50F2.40206@ubuntu.com>
On Thu, Jun 12, 2014 at 09:16:34PM -0400, Phillip Susi wrote:
Show 10 quoted lines
> > 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? ).
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.

-Peff
Previous: Phillip SusiNext: Phillip Susi
Message 5 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.