From: Mathieu Liénard--Mayor Date: Thu, 13 Jun 2013 12:19:53 GMT Subject: Re: New feature discussion: git rebase --status Message-ID: In-Reply-To: Le 2013-06-13 07:52, Antoine Pelisse a écrit : > On Thu, Jun 13, 2013 at 12:19 AM, Junio C Hamano > wrote: >> Antoine Pelisse 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, > >> 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 ? Personally I believe we should not make it the default output. Currently, the output I'm working on is the following: $ git status # HEAD detached from ecb9f3e # You are currently editing a832578 while rebasing branch 'split-rm-v7' on 'ecb9f3e'. # (use "git commit --amend" to amend the current commit) # (use "git rebase --continue" once you are satisfied with your changes) $ git status --rebase-todo # HEAD detached from ecb9f3e # You are currently editing a832578 while rebasing branch 'split-rm-v7' on 'ecb9f3e'. # Still 2 patches left to apply: # e a832578 rm: better error message on failure for multiple files # e fd0330b rm: introduce advice.rmHints to shorten messages # (use "git commit --amend" to amend the current commit) # (use "git rebase --continue" once you are satisfied with your changes) I'm still unsure about the name of the flag, I chose that one accordingly to .git/merge-rebase/rebase-todo -- Mathieu Liénard--Mayor, 2nd year at Grenoble INP - ENSIMAG (+33)6 80 56 30 02