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

Re: When exactly should REBASE_HEAD exist?

From
SHStefan Haller <lists@haller-berlin.de>
Date
Mar 7, 2023, 13:16 UTC
Message-ID
<48f58b30-13d7-cd1d-6f7d-6cc63d2c9178@haller-berlin.de>
In-Reply-To
<CAPx1Gvc+rBMe1bsg8XW_DyPUN9aJu9tQyhMLP0Zu-aeWCkzSGw@mail.gmail.com>
On 06.03.23 04:31, Chris Torek wrote:
Show 12 quoted lines
> On Sat, Mar 4, 2023 at 12:36 AM Stefan Haller <lists@haller-berlin.de> wrote:
>> I'm surprised to hear that worktrees play a role in this. Do you have
>> more details about this?
> 
> $ git worktree add foo
> $ cd ../foo
> $ git rebase -i HEAD~2
> 
> puts the rebase-todo file into
> `.git/worktrees/foo/rebase-merge/git-rebase-todo`;
> all the status files will likewise be in the `.git/worktrees/foo/`
> directory.

I see. That should be taken care of by not hard-coding ".git/...", but using something like "git rev-parse --git-path ...". We are doing that already, otherwise most of lazygit's other rebase commands wouldn't work in worktrees.

Show 18 quoted lines
>>> It would be best if `git status`
>>> reported all of this information directly ...
> 
>> Yes, that would be nice, but based on what state would it provide this
>> information? Are you suggesting that some new file should be added to
>> .git/rebase-merge/ to keep track of it (more reliably than the amend
>> file does today), or could the information be derived somehow from what
>> exists already?
> 
> I don't know which parts are reliably derive-able today, but to
> the extent that `git status` *can't* provide the necessary information,
> I'd call that a bug in `gitt status`, to be fixed by saving that information
> somewhere. Until it exists, there's nothing you can do, but if and when
> (a) it does exist and (b) `git status` provides it, it won't matter
> whether it's in some added worktree, or moves around or changes
> form: you'll get it in a reliable fashion.
> 
> In other words, this is not helpful *yet*. :-)

I see, thanks for the explanation. I agree. Trouble is, I don't have the capacity to drive such an addition to git status, and I doubt anybody else would be interested in doing it for me (are you? :-), so...

-Stefan
Previous: Chris TorekNext: Phillip Wood
Message 8 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.