From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 02 Apr 2013 20:19:37 GMT
Subject: Re: [PATCH 1/2] status: show 'revert' state and status hint
Message-ID: <7vobdwbs86.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1364912422-29536-1-git-send-email-Matthieu.Moy@imag.fr>

Matthieu Moy <Matthieu.Moy@imag.fr> 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."));
> +	if (advice_status_hints) {
> +		if (has_unmerged(s))
> +			status_printf_ln(s, color,
> +				_("  (fix conflicts and run \"git revert --continue\")"));
> +		else
> +			status_printf_ln(s, color,
> +				_("  (all conflicts fixed: run \"git revert --continue\")"));
> +	}
> +	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 (advice_status_hints) {
		if unmerged
			fix and continue
		else
			say continue
		you can also say abort
	}

Will queue on 'pu', with an straight-forward "SQUASH???" on top.

Thanks.