summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan McGee <dpmcgee@gmail.com>2011-04-07 17:04:20 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-04-07 22:54:04 (GMT)
commit3a243f7024f21c2c2205cd861f3bb756b0ec43a0 (patch)
treecafd7dd35224d007d7b249c94ca439b61f6a46ae
parent21ec98a75d9cecaeb1493462da593343441661b6 (diff)
downloadgit-3a243f7024f21c2c2205cd861f3bb756b0ec43a0.zip
git-3a243f7024f21c2c2205cd861f3bb756b0ec43a0.tar.gz
git-3a243f7024f21c2c2205cd861f3bb756b0ec43a0.tar.bz2
stash: ensure --no-keep-index and --patch can be used in any order
Don't assume one comes after the other on the command line. Use a three-state variable to track and check its value accordingly. Signed-off-by: Dan McGee <dpmcgee@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xgit-stash.sh9
-rwxr-xr-xt/t3904-stash-patch.sh2
2 files changed, 6 insertions, 5 deletions
diff --git a/git-stash.sh b/git-stash.sh
index a305fb1..fd66884 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
diff --git a/t/t3904-stash-patch.sh b/t/t3904-stash-patch.sh
index 4d58789..781fd71 100755
--- a/t/t3904-stash-patch.sh
+++ b/t/t3904-stash-patch.sh
@@ -48,7 +48,7 @@ test_expect_success PERL 'git stash -p --no-keep-index' '
verify_state bar dummy bar_index
'
-test_expect_failure PERL 'git stash --no-keep-index -p' '
+test_expect_success PERL 'git stash --no-keep-index -p' '
set_state dir/foo work index &&
set_state bar bar_work bar_index &&
(echo n; echo y) | git stash save --no-keep-index -p &&