diff options
| author | Dan McGee <dpmcgee@gmail.com> | 2011-04-07 12:04:20 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-04-07 15:54:04 -0700 |
| commit | 3a243f7024f21c2c2205cd861f3bb756b0ec43a0 (patch) | |
| tree | cafd7dd35224d007d7b249c94ca439b61f6a46ae /git-stash.sh | |
| parent | 21ec98a75d9cecaeb1493462da593343441661b6 (diff) | |
| download | git-3a243f7024f21c2c2205cd861f3bb756b0ec43a0.tar.gz | |
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>
Diffstat (limited to 'git-stash.sh')
| -rwxr-xr-x | git-stash.sh | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/git-stash.sh b/git-stash.sh index a305fb19f1..fd66884090 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 |