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

When exactly should REBASE_HEAD exist?

From
SHStefan Haller <lists@haller-berlin.de>
Date
Feb 28, 2023, 12:55 UTC
Message-ID
<961e68d7-5f43-c385-10fa-455b8e2f32d0@haller-berlin.de>

As far as I can tell, REBASE_HEAD always points to the last commit that was attempted to be applied in a rebase, not matter whether that attempt was successful or not. In other words, when you break in a rebase with "edit" or "break", REBASE_HEAD is the same as HEAD (except when you break before the first commit, in that case REBASE_HEAD is unset).

I wonder whether it would make sense to set REBASE_HEAD only when applying a patch failed. That seems to be the main use case of it.

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 assuming that the 2nd commit conflicted, currently the display looks like this:

  pick   4th commit
  pick   3rd commit
         1st commit  <-- YOU ARE HERE

I would like to extend this to also show a "fake entry" for the commit that conflicted, if there is one. REBASE_HEAD is perfect for this, except that I need a way to distinguish whether it was applied already or not.

I currently do that by comparing it against HEAD, and only showing it when they are different. That doesn't always work though, e.g. when I amend the current "edit" commit.

Any better suggestions how to work around this?
-Stefan
Next: Phillip Wood
Message 1 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.