Re: When exactly should REBASE_HEAD exist?
- From
- Stefan Haller <lists@haller-berlin.de>
- Date
- Mar 8, 2023, 19:02 UTC
- Message-ID
- <28b78355-e3db-d33a-c576-653740a4a1f3@haller-berlin.de>
- In-Reply-To
- <xmqqo7p4zb8d.fsf@gitster.g>
On 07.03.23 19:07, Junio C Hamano wrote:
Show 24 quoted lines
> Stefan Haller <lists@haller-berlin.de> writes: > >> 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?
It fares a little better, but not much, and it doesn't look like I can use its information to implement the behavior I want.
The difference to lazygit is that git status shows both the last few entries of the "done" file and the first few entries of the "git-rebase-todo" file, so at least I have a complete picture of which commits are involved. Lazygit doesn't show the "done" file, only the commits that are on the branch now, so the currently conflicting commit is missing.
In addition, git status shows the message "(fix conflicts and then run "git rebase --continue")", but only if there are unmerged files; once I resolve all conflicts and stage the changes, that message is no longer shown, and at that point I don't see any way to tell whether the last commit was applied successfully or not.
-Stefan