From: Phillip Susi <psusi@ubuntu•com>
To: Andreas Krey <a.krey@gmx•de>
Cc: Andrew Ardill <andrew.ardill@gmail•com>,
Junio C Hamano <gitster@pobox•com>,
git@vger•kernel.org
Subject: Re: stash refuses to pop
Date: Sun, 15 Apr 2012 21:29:49 -0400 [thread overview]
Message-ID: <4F8B760D.6030207@ubuntu.com> (raw)
In-Reply-To: <20120414042713.GA13889@inner.h.iocl.org>
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 04/14/2012 12:27 AM, Andreas Krey wrote:
> (Late to the game.) Actually, this is exactly what I would have proposed
> to do. Git is a bit shy on performing a merge into a locally modified
> file. I assumed so far that is because there is no way of aborting
> such a merge (resetting to the state of local modifications before the
> attempt). With the temporary commit you have a way of retrying the pop
> merge if you lost your way in it.
>
> And I think that is a good idea; I never liked the way in which a cvs/svn
> update merged into locally modified files without a way to undo, and
> thus forcing you to clean up the potential mess manually. (Ok, they leave
> the old files lying arond, but that doesn't help rewinding the state.)
That makes sense for the default behavior, but there should be a way to override. Or maybe git could automatically stash the current state to a temporary commit before applying the requested stash and print the sha1 of that commit ( or save it as ORIG_HEAD ) so you could undo the stash pop/apply.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
iQEcBAEBAgAGBQJPi3YKAAoJEJrBOlT6nu75OXAH+gK4pfFomFgblw1sLb9Bpgud
0O88dtWWOr9/bNR6NIiIWj76x+xMiRMxuq2YP3/6vkuhGAtVxYqoHc/BkWUmzop/
oma30g244H17Oa0r9H0yf6n6v824xv3tVx166cQ0pVeBnnFs1GINxjODuD0QGTnH
VewepnyaYkPRSjgzrJShOadaxRZFZWUBNlncLbHMLBNJl+n4cMXsg9uasEv3rG73
Mw+zAKcMMf4zCfxE0T2dpbf0hOOde8PWtJY12RAYWvhn7YTVP9Uj+t3a9flb2UyB
zuo84Xv49meMB9ce4DDtANXeH8uKamBGk94NH6Khv6LewuG5SOS7DukDEJxA+B0=
=xaNu
-----END PGP SIGNATURE-----
next prev parent reply other threads:[~2012-04-16 1:29 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-10 17:52 stash refuses to pop Phillip Susi
2012-04-10 18:05 ` Junio C Hamano
2012-04-10 18:56 ` Phillip Susi
2012-04-11 2:47 ` Andrew Ardill
2012-04-11 2:59 ` Phillip Susi
2012-04-14 4:27 ` Andreas Krey
2012-04-14 10:12 ` Jakub Narebski
2012-04-16 1:29 ` Phillip Susi [this message]
2012-04-11 7:15 ` Victor Engmark
2012-04-11 5:58 ` Johannes Sixt
2012-04-11 14:21 ` Phillip Susi
2012-04-12 5:50 ` Johannes Sixt
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=4F8B760D.6030207@ubuntu.com \
--to=psusi@ubuntu$(echo .)com \
--cc=a.krey@gmx$(echo .)de \
--cc=andrew.ardill@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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