summaryrefslogtreecommitdiff
path: root/git-stash.sh
diff options
context:
space:
mode:
authorThomas Rast <trast@student.ethz.ch>2010-02-15 16:05:46 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-02-16 05:46:27 (GMT)
commit460ccd0e19774fd5e4f69de5a454068c686ac5a6 (patch)
treef507de18c02dedc3c2bbebab7856df5ee3b51467 /git-stash.sh
parent8324b977aef3d2301f170e23f498b50e11302575 (diff)
downloadgit-460ccd0e19774fd5e4f69de5a454068c686ac5a6.zip
git-460ccd0e19774fd5e4f69de5a454068c686ac5a6.tar.gz
git-460ccd0e19774fd5e4f69de5a454068c686ac5a6.tar.bz2
stash pop: remove 'apply' options during 'drop' invocation
The 'git stash pop' option parsing used to remove the first argument in --index mode. At the time this was implemented, this first argument was always --index. However, since the invention of the -q option in fcdd0e9 (stash: teach quiet option, 2009-06-17) you can cause an internal invocation of git stash drop --index by running git stash pop -q --index which then of course fails because drop doesn't know --index. To handle this, instead let 'git stash apply' decide what the future argument to 'drop' should be. Warning: this means that 'git stash apply' must parse all options that 'drop' can take, and deal with them in the same way. This is currently true for its only option -q. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Acked-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-stash.sh')
-rwxr-xr-xgit-stash.sh7
1 files changed, 5 insertions, 2 deletions
diff --git a/git-stash.sh b/git-stash.sh
index 4febbbf..79b2771 100755
--- a/git-stash.sh
+++ b/git-stash.sh
@@ -222,6 +222,7 @@ show_stash () {
}
apply_stash () {
+ applied_stash=
unstash_index=
while test $# != 0
@@ -243,6 +244,9 @@ apply_stash () {
if test $# = 0
then
have_stash || die 'Nothing to apply'
+ applied_stash="$ref_stash@{0}"
+ else
+ applied_stash="$*"
fi
# stash records the work tree, and is a merge between the
@@ -421,8 +425,7 @@ pop)
shift
if apply_stash "$@"
then
- test -z "$unstash_index" || shift
- drop_stash "$@"
+ drop_stash "$applied_stash"
fi
;;
branch)