Re: New feature discussion: git rebase --status

From: Mathieu Liénard--Mayor <mathieu.lienard--mayor@ensimag.fr>
Date: Jun 12, 2013, 11:23 UTC
Message-ID: <3cafe99fe3b868e6fc025110d324b9c8@ensibm.imag.fr>
In-Reply-To: <51B857B0.5030603@ensimag.fr>

Le 2013-06-12 13:12, Célestin Matte a écrit :

Show 60 quoted lines

> Le 12/06/2013 12:17, Mathieu Liénard--Mayor a écrit :
>> Now, I'm not sure if we should always display the list of commits
>> already applied and those left to apply. What I mean is that maybe 
>> it
>> would be better to make status require a flag to display the two 
>> lists.
>> Something like (not sure about the flag's name):
>>
>> $ git status --rebase-state
>> # HEAD detached from ecb9f3e
>> # Already applied 2 patches:
>> #     b170635... my_commit_message
>> #     b170635... my_commit_message
>> # You are currently editing a832578... my_commit_message [3/5] while
>> rebasing.
>> # 2 patches left to apply:
>> #    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)
>> # ......
>> # ......
>>
>> What do you guys think ?
>
> I agree. When you're in the process of rebasing a big list of 
> commits,
> it would produce a lot of not-so-useful output, when what you want to
> see is, most of the time, which commit you are currently editing.
> So, in my opinion, whole lists should not be displayed by default.
>
> Now, if I could suggest an improvement over that list: when you 
> rebase
> some commits, I'm quite sure the history of what you already did is
> stored somewhere since you can revert it which git rebase --abort. It
> would be nice to improve that list by displaying these informations, 
> like:
>
> $ git status --rebase-state
> # HEAD detached from ecb9f3e
> # Already applied 4 patches:
> #              b170635... my_commit_message
> #              b170635... my_commit_message
> # new:         b170635... my_commit_message
> # modified:    b170635... my_commit_message
> # reworded:    b170635... my_commit_message
> # You are currently editing a832578... my_commit_message [5/8] while
> rebasing.
> # 2 patches left to apply:
> #    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)
> # ......
> # ......
>
> I have no idea how complicated it would be to do that, though.
> What do you think?

If i'm not mistaking, it shouldn't be too hard, since it's pretty close 
to
the content of .git/rebase-merge/done:
    reword a832578 rm: better error message on failure for multiple 
files
    edit fd0330b rm: introduce advice.rmHints to shorten messages

-- 
Mathieu Liénard--Mayor,
2nd year at Grenoble INP - ENSIMAG
(+33)6 80 56 30 02