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

Re: When exactly should REBASE_HEAD exist?

From
PWPhillip Wood <phillip.wood123@gmail.com>
Date
Mar 16, 2023, 17:46 UTC
Message-ID
<f7577c57-f70d-cca3-3f25-18525d40d79b@dunelm.org.uk>
In-Reply-To
<805626af-b147-d3cf-5257-a5b90b7cf1d9@haller-berlin.de>
Hi Stefan
On 10/03/2023 17:42, Stefan Haller wrote:
> I tried the algorithm now and seems to do exactly what I want, so thanks
> for the help with this, I'm happy now.
I'm glad you've got something working
> There's a slight correction though: if a command is rescheduled, then
> git appears to re-append the last successful command to the end of the
> "done" file (it's in there twice now). So I have to check the > second-to-last command of "done" against the first command of
> "git-rebase-todo" to find out if a command was rescheduled.

Oh, sorry I'd misremembered how it works. I think it is actually a bug that we write the last successful command to "done" again when rescheduling but it sounds like you have a reliable work-around.

Best Wishes
Phillip
> -Stefan
Previous: Stefan HallerNext: Phillip Wood
Message 18 of 25 in “When exactly should REBASE_HEAD exist?”
  1. Stefan HallerFeb 28, 2023
  2. Phillip WoodMar 2, 2023
  3. Stefan HallerMar 2, 2023
  4. Stefan HallerMar 3, 2023
  5. Chris TorekMar 3, 2023
  6. Stefan HallerMar 4, 2023
  7. Chris TorekMar 6, 2023
  8. Stefan HallerMar 7, 2023
  9. Phillip WoodMar 5, 2023
  10. Stefan HallerMar 5, 2023
  11. Phillip WoodMar 5, 2023
  12. Stefan HallerMar 5, 2023
  13. Stefan HallerMar 5, 2023
  14. Phillip WoodMar 5, 2023
  15. Stefan HallerMar 8, 2023
  16. Phillip WoodMar 10, 2023
  17. Stefan HallerMar 10, 2023
  18. Phillip WoodMar 16, 2023
  19. Phillip WoodMar 19, 2023
  20. Stefan HallerMar 20, 2023
  21. Stefan HallerMar 20, 2023
  22. Junio C HamanoMar 7, 2023
  23. Stefan HallerMar 8, 2023
  24. Junio C HamanoMar 8, 2023
  25. Stefan HallerMar 9, 2023

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.