From: David Kastrup <dak@gnu.org>
Date: Thu, 27 Feb 2014 00:19:14 GMT
Subject: Re: `git stash pop` UX Problem
Message-ID: <878usx5rwd.fsf@fencepost.gnu.org>
In-Reply-To: <xmqq4n3l34ex.fsf@gitster.dls.corp.google.com>

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

> David Kastrup <dak@gnu.org> writes:
>
>> All that verbosity...
>>
>> $ git stash pop
>> Auto-merging foo.txt
>> CONFLICT (content): Merge conflict in foo.txt
>> Cowardly refusing to drop stash
>> $
>
> Actually, modulo "Cowardly", that may be the most harmless phrasing,
> as apply_stash may try to signal an error for reasons not related to
> an inability to apply the change cleanly (e.g. we may have failed to
> refresh the index).

Without "Cowardly", the capriciosity of "refusing" does not make much
sense.  The error message is a tribute to GNU tar:
dak@lola:/tmp$ mkdir x
dak@lola:/tmp$ tar cfz x
tar: Cowardly refusing to create an empty archive
Try `tar --help' or `tar --usage' for more information.
dak@lola:/tmp$ 

The boring variant would be

$ git stash pop
Auto-merging foo.txt
CONFLICT (content): Merge conflict in foo.txt
Not dropping stash
$

-- 
David Kastrup