git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: git stash while pending merge should not be allowed

From
John Keeping <john@keeping.me.uk>
Date
Jun 14, 2013, 08:30 UTC
Message-ID
<20130614083018.GD23890@serenity.lan>
In-Reply-To
<7v1u8du5as.fsf@alter.siamese.dyndns.org>
On Fri, Jun 07, 2013 at 11:47:07AM -0700, Junio C Hamano wrote:
Show 10 quoted lines
> 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)?

I don't think there's any need to prevent stash running in these cases and I sometimes find it useful that I can stash during a rebase.

Having said that, I wonder what happens with "cherry-pick -x" if you do stash changes while it is stopped. I don't think that is as serious as the merge case because it's easy to detect in the commit message.

Previous: Scott McPeak
Message 4 of 4 in “git stash while pending merge should not be allowed”
  1. Scott McPeakJun 7, 2013
  2. Junio C HamanoJun 7, 2013
  3. Scott McPeakJun 13, 2013
  4. John KeepingJun 14, 2013

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.