From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 07 Jun 2013 18:47:07 GMT
Subject: Re: git stash while pending merge should not be allowed
Message-ID: <7v1u8du5as.fsf@alter.siamese.dyndns.org>
In-Reply-To: <51B18331.6060302@coverity.com>

Scott McPeak <smcpeak@coverity.com> writes:

> I suggest that this problem could easily have been avoided if "git
> stash" refused to run with a pending merge (present MERGE_HEAD file),
> since this is crucial repository state that it does not save.  This
> seems similar to what "git cherry-pick" does.

Sounds senslbe.  What do we want to see happen in other states, in
which Git gives control back to the user asking for help before
moving forward (e.g. am, rebase, cherry-pick, revert)?