From: Jonathan Nieder <jrnieder@gmail.com>
Date: Wed, 27 Jul 2011 05:19:47 GMT
Subject: Re: [PATCH 17/18] revert: Don't implictly stomp pending sequencer operation
Message-ID: <20110727051947.GL18470@elie>
In-Reply-To: <1311736755-24205-18-git-send-email-artagnon@gmail.com>

Ramkumar Ramachandra wrote:

[...]
> +		if (create_seq_dir() < 0) {
> +			advise(_("A cherry-pick or revert is in progress."));
> +			advise(_("Use --reset to forget about it"));
> +			return -1;
> +		}

The usual formula is:

	error(... description of error ...)
	if (advice_foo_bar [i.e., if the user is not tired of the advice already]) {
		advise(... how to recover from error ...);
		advise(... more lines ...);
	}