summaryrefslogtreecommitdiff
path: root/git-stash.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-05-04 21:57:49 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-05-04 21:57:49 (GMT)
commite9f1878da7be816042c915cdf0542f9325c36209 (patch)
tree5acea99febe456515699d1d7cd6176be3a0d5b13 /git-stash.sh
parentf28d2e33c64819d0425c426cd2c4511634096a40 (diff)
parent3a243f7024f21c2c2205cd861f3bb756b0ec43a0 (diff)
downloadgit-e9f1878da7be816042c915cdf0542f9325c36209.zip
git-e9f1878da7be816042c915cdf0542f9325c36209.tar.gz
git-e9f1878da7be816042c915cdf0542f9325c36209.tar.bz2
Merge branch 'dm/stash-k-i-p' into maint
* dm/stash-k-i-p: stash: ensure --no-keep-index and --patch can be used in any order stash: add two more tests for --no-keep-index
Diffstat (limited to 'git-stash.sh')
-rwxr-xr-xgit-stash.sh9
1 files changed, 5 insertions, 4 deletions
diff --git a/git-stash.sh b/git-stash.sh
index fbd4bc1..81a59a2 100755
--- a/git-stash.sh
+++ b/git-stash.sh
@@ -136,11 +136,12 @@ save_stash () {
keep_index=t
;;
--no-keep-index)
- keep_index=
+ keep_index=n
;;
-p|--patch)
patch_mode=t
- keep_index=t
+ # only default to keep if we don't already have an override
+ test -z "$keep_index" && keep_index=t
;;
-q|--quiet)
GIT_QUIET=t
@@ -185,7 +186,7 @@ save_stash () {
then
git reset --hard ${GIT_QUIET:+-q}
- if test -n "$keep_index" && test -n $i_tree
+ if test "$keep_index" = "t" && test -n $i_tree
then
git read-tree --reset -u $i_tree
fi
@@ -193,7 +194,7 @@ save_stash () {
git apply -R < "$TMP-patch" ||
die "Cannot remove worktree changes"
- if test -z "$keep_index"
+ if test "$keep_index" != "t"
then
git reset
fi