Re: [PATCH] git-am: suggest what to do with superfluous patches

From: Ramkumar Ramachandra <artagnon@gmail.com>
Date: May 31, 2010, 20:17 UTC
Message-ID: <AANLkTinRafLwhzxUuijdBzfzxLtTb_ua3aM1IxVCCgfa@mail.gmail.com>
In-Reply-To: <7vwrujzx3t.fsf@alter.siamese.dyndns.org>

Hi Junio,

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

Show 17 quoted lines

> Jan Krüger <jk@jk.gs> writes:
>> diff --git a/git-am.sh b/git-am.sh
>> index 87ffae2..43ea52c 100755
>> --- a/git-am.sh
>> +++ b/git-am.sh
>> @@ -726,6 +726,8 @@ do
>>               resolved=
>>               git diff-index --quiet --cached HEAD -- && {
>>                       echo "No changes - did you forget to use 'git add'?"
>> +                     echo "If there is nothing left to stage, chances are that something else"
>> +                     echo "already introduced the same changes; you might want to skip this patch."
>
> The exact wording I'd let people to fight out, but I think this is
> probably better than Ramkumar's one that says "if you dropped".  The user
> may not know that he is doing an equivalent of dropping as a side effect
> of the new base that had accepted the same change, and your message nudges
> the reader to realize that.

I didn't see this patch on the list- did Jan send it to the list? Yeah, the wording here is nicer, except you might also want to include an explicit note on using "$cmdline --skip".

-- Ram