All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Stefan Haller <lists@haller-berlin.de>
Cc: git@vger.kernel.org
Subject: Re: When exactly should REBASE_HEAD exist?
Date: Tue, 07 Mar 2023 10:07:30 -0800	[thread overview]
Message-ID: <xmqqo7p4zb8d.fsf@gitster.g> (raw)
In-Reply-To: <961e68d7-5f43-c385-10fa-455b8e2f32d0@haller-berlin.de> (Stefan Haller's message of "Tue, 28 Feb 2023 13:55:20 +0100")

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?

  parent reply	other threads:[~2023-03-07 18:12 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-02-28 12:55 When exactly should REBASE_HEAD exist? Stefan Haller
2023-03-02 10:19 ` Phillip Wood
2023-03-02 20:27   ` Stefan Haller
2023-03-03 10:57     ` Stefan Haller
2023-03-03 21:25       ` Chris Torek
2023-03-04  8:36         ` Stefan Haller
2023-03-06  3:31           ` Chris Torek
2023-03-07 13:16             ` Stefan Haller
2023-03-05 14:33       ` Phillip Wood
2023-03-05 16:58         ` Stefan Haller
2023-03-05 14:31     ` Phillip Wood
2023-03-05 16:59       ` Stefan Haller
2023-03-05 19:13         ` Stefan Haller
2023-03-05 20:15           ` Phillip Wood
2023-03-08 19:02             ` Stefan Haller
2023-03-10  9:56               ` Phillip Wood
2023-03-10 17:42                 ` Stefan Haller
2023-03-16 17:46                   ` Phillip Wood
2023-03-19 14:50                     ` Phillip Wood
2023-03-20  7:29                       ` Stefan Haller
2023-03-20  8:42                         ` Stefan Haller
2023-03-07 18:07 ` Junio C Hamano [this message]
2023-03-08 19:02   ` Stefan Haller
2023-03-08 19:40     ` Junio C Hamano
2023-03-09 14:45       ` Stefan Haller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqo7p4zb8d.fsf@gitster.g \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=lists@haller-berlin.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.