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

[RFC] Issues around C rebase--interactive

From
Daniel Barkalow <barkalow@iabervon.org>
Date
Feb 17, 2008, 19:15 UTC
Message-ID
<alpine.LNX.1.00.0802171347060.5816@iabervon.org>

I'm working on porting rebase--interactive to C. This has a number of interesting issues:

This will be the first C command which stops in the middle and then gets resumed. I've been thinking it would be nice if all of the commands like that shared handling of the process in some way. I think it would be good to have a "git abort" that would reset a conflicted merge, abort a rebase, etc., and probably "git checkout" should either require that there's nothing in progress or should abort anything that is in progress. (You can presently get lots of fun confusion by starting a rebase, checking out a different branch, deleting the branch that you were rebasing, attempting another rebase and trying to clean up.)

It would also be nice to have a "git resume" that would continue whatever needed user attention after you've done it. (But you'd still need "git rebase skip" to do that command-specific first step before resuming.)

There's a lot of stuff stored presently in ways that are convenient for shell scripts and inconvenient for C. Is anything else depending on the contents or location of ".git/.dotest-merge"?

	-Daniel
*This .sig left intentionally blank*
Next: Johannes Schindelin
Message 1 of 3 in “[RFC] Issues around C rebase--interactive”
  1. Daniel BarkalowFeb 17, 2008
  2. Johannes SchindelinFeb 17, 2008
  3. Junio C HamanoFeb 17, 2008

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.