Re: Newbie grief

From: Junio C Hamano <gitster@pobox.com>
Date: May 4, 2012, 14:50 UTC
Message-ID: <7vehr0c852.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1336126182.3490.28.camel@beez.lab.cmartin.tk>

Carlos Martín Nieto <cmn@elego.de> writes:

Show 25 quoted lines

> On Thu, 2012-05-03 at 22:25 -0700, Junio C Hamano wrote:
>> 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?
>
> If you're thinking of me,...

No, I was referring to f25950f (push: Provide situational hints for non-fast-forward errors, 2012-03-20).