From: Jeff King <peff@peff.net>
To: Ed Avis <eda@waniasset.com>
Cc: git@vger.kernel.org
Subject: Re: Feature: git stash pop --always-drop
Date: Mon, 10 Aug 2015 08:41:25 -0400 [thread overview]
Message-ID: <20150810124125.GC32371@sigill.intra.peff.net> (raw)
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
next prev parent reply other threads:[~2015-08-10 12:41 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-10 10:42 Feature: git stash pop --always-drop Ed Avis
2015-08-10 12:41 ` Jeff King [this message]
2015-08-10 12:50 ` Ed Avis
2015-08-10 13:32 ` Jeff King
2015-08-10 13:43 ` Ed Avis
2015-08-10 13:49 ` Jeff King
2015-08-10 14:01 ` Ed Avis
2015-08-10 15:08 ` Junio C Hamano
2015-08-10 15:16 ` Ed Avis
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150810124125.GC32371@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=eda@waniasset.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).