Re: [PATCH 1/2] status: show 'revert' state and status hint

2013-04-02 Thread Matthieu Moy
Junio C Hamano writes: >> +if (advice_status_hints) { >> +} >> +if (advice_status_hints) >> +status_printf_ln(s, color, >> +_(" (use \"git revert --abort\" to cancel the revert >> operation)")); > > Why not a single conditional? i.e. > > if (adv

Re: [PATCH 1/2] status: show 'revert' state and status hint

2013-04-02 Thread Junio C Hamano
Matthieu Moy writes: > +static void show_revert_in_progress(struct wt_status *s, > + struct wt_status_state *state, > + const char *color) > +{ > + status_printf_ln(s, color, _("You are currently reverting a commit.")); >

[PATCH 1/2] status: show 'revert' state and status hint

2013-04-02 Thread Matthieu Moy
This is the logical equivalent for "git status" of 3ee4452 (bash: teach __git_ps1 about REVERT_HEAD). Signed-off-by: Matthieu Moy --- > --- a/contrib/completion/git-prompt.sh > +++ b/contrib/completion/git-prompt.sh > @@ -282,6 +282,8 @@ __git_ps1 () > r="|MERGING" >