From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 14 Mar 2012 17:26:34 GMT
Subject: Re: [PATCH] push: Provide situational hints for non-fast-forward errors
Message-ID: <7vty1rqek5.fsf@alter.siamese.dyndns.org>
In-Reply-To: <vpqipi7zh3n.fsf@bauges.imag.fr>

Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> writes:

> I'm no expert in gettext, but I think the internationalization people
> will have a hard time dealing with a single message split accross an
> array.

My original patch on this topic predates the i18n adjustment we made to
advice infrastructure in 23cb5bf (i18n of multi-line advice messages,
2011-12-22), so that is an understandable oversight.

Thanks for catching this.

> Actually, I prefer the effect of a single advise() call (i.e. say
> "hint:" just once, not for each line), but this part is subjective.

The way advice.c::error_resolve_conflict() uses multi-line advice message
should be a good template.  The choice between "hint" for once or for
every line can later be adjusted in advice.c::advice() if we want to and
such a change will convert all the users of advice API consistently.