threads / discuss / 39427

Implementation of git rebase --status

Subject: Implementation of git rebase --status

## tl;dr

3 messages between May 26, 2015 and May 26, 2015.

replies: 2people: 2as markdown or json

Guillaume Pages· May 26, 2015, 14:38 UTC · lore
Hi, 

I would like to implement a new command git rebase --status to inform the user about the current rebase session. Here is a sample of what I think it could look like in case of merge conflict:

git rebase --status You are in the middle of a rebase session. The line that paused this session is: pick 848a16f commit with conflicts CONFLICT (content): Merge conflict in file1 Consult and edit remaining actions with git rebase --edit-todo

In case of syntax error: 

git rebase --status You are in the middle of a rebase session. The line that paused this session is: tick 848a16f syntax error SYNTAX ERROR Consult and edit remaining actions with git rebase --edit-todo

In case of error during the execution of a script: 

git rebase --status You are in the middle of a rebase session. The line that paused this session is: exec exit 3 ERROR IN SCRIPT EXECUTION Consult and edit remaining actions with git rebase --edit-todo

Do you think it could be usefull or do you have any suggestion? 
Thanks, 
Guillaume Pagès 
Junio C Hamano· May 26, 2015, 16:20 UTC · re: Guillaume Pages · lore

Re: Implementation of git rebase --status

Guillaume Pages <guillaume.pages@ensimag.grenoble-inp.fr> writes:
> Do you think it could be usefull or do you have any suggestion? 
All of your examples say things like:
    > You are in the middle of a rebase session. 
    > The line that paused this session is: 
but what if there is no such "line"?

IOW, what does the user see when using this new option during a "git rebase" (not "git rebase -i")?

Other than that, sounds like a neat thing to do.
Guillaume Pages· May 26, 2015, 18:21 UTC · re: Junio C Hamano · lore

Re: Implementation of git rebase --status

Junio C Hamano <gitster@pobox.com> writes:
>Guillaume Pages <guillaume.pages@ensimag.grenoble-inp.fr> writes: 
>> Do you think it could be useful or do you have any suggestion? 
>All of your examples say things like: 
>> You are in the middle of a rebase session. 
>> The line that paused this session is: 
>but what if there is no such "line"? 
>IOW, what does the user see when using this new option during a "git 
>rebase" (not "git rebase -i")? 
I guess it should display the sha1 of the patch that failed in this case.
>Other than that, sounds like a neat thing to do. 

← back to recent threads