X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft3904-stash-patch.sh;h=781fd716815d90956575b042d72601e67834231c;hb=78c5be231bbd58f4deb6ecfabfaff1b2279a4c25;hp=d1819ca23a782eddc61d86c62060242b293b86b0;hpb=ae830c211bfbf192bcefb821130fe4943daf4291;p=git.git diff --git a/t/t3904-stash-patch.sh b/t/t3904-stash-patch.sh index d1819ca23..781fd7168 100755 --- a/t/t3904-stash-patch.sh +++ b/t/t3904-stash-patch.sh @@ -20,7 +20,7 @@ test_expect_success PERL 'setup' ' # note: bar sorts before dir, so the first 'n' is always to skip 'bar' test_expect_success PERL 'saying "n" does nothing' ' - set_state dir/foo work index + set_state dir/foo work index && (echo n; echo n) | test_must_fail git stash save -p && verify_state dir/foo work index && verify_saved_state bar @@ -48,6 +48,18 @@ test_expect_success PERL 'git stash -p --no-keep-index' ' verify_state bar dummy bar_index ' +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 && + verify_state dir/foo head head && + verify_state bar bar_work dummy && + git reset --hard && + git stash apply --index && + verify_state dir/foo work index && + verify_state bar dummy bar_index +' + test_expect_success PERL 'none of this moved HEAD' ' verify_saved_head '