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

Re: When exactly should REBASE_HEAD exist?

From
Junio C Hamano <gitster@pobox.com>
Date
Mar 7, 2023, 18:07 UTC
Message-ID
<xmqqo7p4zb8d.fsf@gitster.g>
In-Reply-To
<961e68d7-5f43-c385-10fa-455b8e2f32d0@haller-berlin.de>
Stefan Haller <lists@haller-berlin.de> writes:
Show 12 quoted lines
> The reason why I am asking this is: I'm using lazygit, which, during
> interactive rebases, shows a combined view of the real commits that were
> already applied, and the remaining commits that are yet to be applied
> (it gets these by parsing rebase-merge/git-rebase-todo); something like
> this, when I set the 2nd commit to "edit":
>
>   pick   4th commit
>   pick   3rd commit
>          2nd commit  <-- YOU ARE HERE
>          1st commit
>
> This is great, but ...

Stepping a bit, how does our "git status" fare here? It shows what step in a sequence "rebase -i" the user who got control back (due to "break", "exec sh", "edit" or a conflicted "pick") is in. Or at least it tries to. Does it suffer from the same "great, but ..."?

If it works better than how lazygit shows, perhaps how it computes the current state can be reproduced, or better yet, the current state it computed can be exposed, and it can be prototyped by parsing "LC_ALL=C git status -uno" output, perhaps?

Previous: Stefan HallerNext: Stefan Haller
Message 22 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.