From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 04 May 2012 05:25:00 GMT
Subject: Re: Newbie grief
Message-ID: <7vmx5ocyc3.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1167779eee7d442b9db0eecb347d5516-mfwitten@gmail.com>

Michael Witten <mfwitten@gmail.com> writes:

> As for a seemingly conservative suggestion, how about using a little
> more structural white space:
>
>   To $uri_for_central_repo
>    ! [rejected]        HEAD -> feature_0 (non-fast-forward)
>
>   error: failed to push some refs to '$uri_for_central_repo'
>
>   To prevent you from losing history, non-fast-forward updates were rejected
>   Merge the remote changes (e.g. 'git pull') before pushing again.  See the
>   'Note about fast-forwards' section of 'git push --help' for details.
>
> Alas! Error output like this is constructed in the code in a way that
> potentially makes adding such white space non-trivial.
>
> Perhaps the error message system needs an overhall; rather than spitting
> out error messages from anywhere, they ought to be corralled and collated
> by a dedicated subsystem.

Didn't somebody recently rework these messages quite extensively?