undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stash: ensure --no-keep-index and --patch can be used in any order

Browse Source 
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>
This commit is contained in:
Dan McGee 2011-04-07 12:04:20 -05:00 committed by Junio C Hamano
parent 21ec98a75d
commit 3a243f7024
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
git-stash.sh
View File

@ -136,11 +136,12 @@ save_stash () {
keep_index=t keep_index=t
;; ;;
--no-keep-index) --no-keep-index)
keep_index= keep_index=n
;; ;;
-p|--patch) -p|--patch)
patch_mode=t 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) -q|--quiet)
GIT_QUIET=t GIT_QUIET=t
@ -185,7 +186,7 @@ save_stash () {
then then
git reset --hard ${GIT_QUIET:+-q} 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 then
git read-tree --reset -u $i_tree git read-tree --reset -u $i_tree
fi fi
@ -193,7 +194,7 @@ save_stash () {
git apply -R < "$TMP-patch" || git apply -R < "$TMP-patch" ||
die "Cannot remove worktree changes" die "Cannot remove worktree changes"
if test -z "$keep_index" if test "$keep_index" != "t"
then then
git reset git reset
fi fi

2
t/t3904-stash-patch.sh
View File

@ -48,7 +48,7 @@ test_expect_success PERL 'git stash -p --no-keep-index' '
verify_state bar dummy bar_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 dir/foo work index &&
set_state bar bar_work bar_index && set_state bar bar_work bar_index &&
(echo n; echo y) | git stash save --no-keep-index -p && (echo n; echo y) | git stash save --no-keep-index -p &&