From: Matthieu Moy <matthieu.moy@imag.fr>
Date: Sat, 08 Aug 2009 07:44:48 GMT
Subject: Re: [PATCH 2/2 (v2)] reset: make the output more user-friendly.
Message-ID: <vpq7hxeu4un.fsf@bauges.imag.fr>
In-Reply-To: <7viqgztj76.fsf@alter.siamese.dyndns.org>

Junio C Hamano <gitster@pobox.com> writes:

> Matthieu Moy <Matthieu.Moy@imag.fr> writes:
>
>>  cat > expect << EOF
>> -file2: locally modified
>> +Unstaged changes after reset:
>> +M	file2
>
> It simply feels backwards when plumbing output says something in human
> language (e.g. "needs update") while Porcelain output spits out a cryptic
> M or U.  If the goal is human-readability and user-friendliness,

The goal here is just consistency.

And I do consider 'git diff --name-status' as porcelain.

> shouldn't we rather say:
>
> 	Path with local modifications:
>         	file2
>
> or something?

Why not, but if we do, we should also remove this "M" from other
places. It was already there in one error message given by 'git
rebase' in a non-clean tree (and you just accepted a patch giving the
same output for another one).

-- 
Matthieu