All of lore.kernel.org
 help / color / mirror / Atom feed
* Implementation of git rebase --status
       [not found] <1086316854.1201217.1432650834727.JavaMail.zimbra@ensimag.grenoble-inp.fr>
@ 2015-05-26 14:38 ` Guillaume Pages
  2015-05-26 16:20   ` Junio C Hamano
  0 siblings, 1 reply; 3+ messages in thread
From: Guillaume Pages @ 2015-05-26 14:38 UTC (permalink / raw)
  To: git
  Cc: Matthieu Moy, Remi LESPINET, Remi GALAN ALFONSO,
	Louis-Alexandre STUBER, Antoine DELAITE

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 

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: Implementation of git rebase --status
  2015-05-26 14:38 ` Implementation of git rebase --status Guillaume Pages
@ 2015-05-26 16:20   ` Junio C Hamano
  2015-05-26 18:21     ` Guillaume Pages
  0 siblings, 1 reply; 3+ messages in thread
From: Junio C Hamano @ 2015-05-26 16:20 UTC (permalink / raw)
  To: Guillaume Pages
  Cc: git, Matthieu Moy, Remi LESPINET, Remi GALAN ALFONSO,
	Louis-Alexandre STUBER, Antoine DELAITE

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.

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: Implementation of git rebase --status
  2015-05-26 16:20   ` Junio C Hamano
@ 2015-05-26 18:21     ` Guillaume Pages
  0 siblings, 0 replies; 3+ messages in thread
From: Guillaume Pages @ 2015-05-26 18:21 UTC (permalink / raw)
  To: Junio C Hamano
  Cc: git, Matthieu Moy, Remi LESPINET, Remi GALAN ALFONSO,
	Louis-Alexandre STUBER, Antoine DELAITE


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. 

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2015-05-26 18:19 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
     [not found] <1086316854.1201217.1432650834727.JavaMail.zimbra@ensimag.grenoble-inp.fr>
2015-05-26 14:38 ` Implementation of git rebase --status Guillaume Pages
2015-05-26 16:20   ` Junio C Hamano
2015-05-26 18:21     ` Guillaume Pages

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.