Re: New feature discussion: git rebase --status

From: Antoine Pelisse <apelisse@gmail.com>
Date: Jun 13, 2013, 05:52 UTC
Message-ID: <CALWbr2x-4_QSurvScYL+2Utn=-K3Knb7Kif9SAvV_V-ZdvPfCw@mail.gmail.com>
In-Reply-To: <7vzjuvynt0.fsf@alter.siamese.dyndns.org>

On Thu, Jun 13, 2013 at 12:19 AM, Junio C Hamano <gitster@pobox.com> wrote:

Show 22 quoted lines

> Antoine Pelisse <apelisse@gmail.com> writes:
>
>> Maybe we can display previous and next commits to provide some
>> context. Like we do for diff.
>> For example:
>>
>> $ git status
>> # HEAD detached from ecb9f3e
>> # Already applied 330 patches (displaying next 3):
>> #     b170635... my_commit_message
>> #     b170635... my_commit_message
>> #     b170635... my_commit_message
>> # Already applied 119 (displaying last 3)
>> #     b170635... my_commit_message
>> #     b170635... my_commit_message
>> #     b170635... my_commit_message
>
> I think you meant one of them to be
>
>     # Still to be applied 119 (showing the first 3)
>
> instead.

Of course,

Show 6 quoted lines

> I am not sure if it is worth 8 lines, especially given
> that "git log --oneline -$n" would give you "Already applied" part
> that is beyond what will be shown in this message easily if you
> wanted to.  So it might be enough to show "The one that has last
> been replayed" (aka "HEAD") and "The one you are in the middle of
> replaying".

That's very true. The piece of information that is hard to get is "what's left to be done".

So something like this would make sense:

$ git status # HEAD detached from ecb9f3e # You are currently editing a832578... my_commit_message [120/450] while rebasing. # 320 patches left to apply (showing next 3): # b170635... my_commit_message # b170635... my_commit_message # b170635... my_commit_message # (use "git commit --amend" to amend the current commit) # (use "git rebase --continue" once you are satisfied with your changes)

So that's 4 extra lines compared to current output. But should we make it a default ?