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

Re: Feature: git stash pop --always-drop

From
Jeff King <peff@peff.net>
Date
Aug 10, 2015, 12:41 UTC
Message-ID
<20150810124125.GC32371@sigill.intra.peff.net>
In-Reply-To
<loom.20150810T124037-407@post.gmane.org>
On Mon, Aug 10, 2015 at 10:42:30AM +0000, Ed Avis wrote:
> I would find it useful to ask 'git stash pop' to always drop the stash after
> applying it to the working tree, even if there were conflicts.  (Only if there
> was some hard error, such as an I/O error updating some of the files, should
> the stash be left on the stack.)

Hmm. That seems rather dangerous, but hey, if it's not the default, I guess it is your own foot that you are shooting.

> Would a patch for such an --always-drop flag be accepted?

I doubt you will get a good answer to that question; the attitude here is usually "well, we would have to see the patch". For instance, I don't know how easy it will be to tell merge conflicts apart from I/O errors. Figuring that out will probably be part of a rough draft patch.

-Peff
Previous: Ed AvisNext: Ed Avis
Message 2 of 9 in “Feature: git stash pop --always-drop”
  1. Ed AvisAug 10, 2015
  2. Jeff KingAug 10, 2015
  3. Ed AvisAug 10, 2015
  4. Jeff KingAug 10, 2015
  5. Ed AvisAug 10, 2015
  6. Jeff KingAug 10, 2015
  7. Ed AvisAug 10, 2015
  8. Junio C HamanoAug 10, 2015
  9. Ed AvisAug 10, 2015

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.