diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-03-30 18:01:10 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-03-30 18:01:10 -0700 |
| commit | 6d51217467afe5303349cb5c57b6b131201f73f3 (patch) | |
| tree | d6e43ac30a50fabe7b7aee24796ee29455a5ada2 /t/t3903-stash.sh | |
| parent | cb3b3974b3321522b1c5c61d358d1259f19aae29 (diff) | |
| parent | 5891c76cd012536a5bb833e512f7262a4b4358c1 (diff) | |
| download | git-6d51217467afe5303349cb5c57b6b131201f73f3.tar.gz | |
Merge branch 'vd/stash-silence-reset'
"git stash" does not allow subcommands it internally runs as its
implementation detail, except for "git reset", to emit messages;
now "git reset" part has also been squelched.
* vd/stash-silence-reset:
reset: show --no-refresh in the short-help
reset: remove 'reset.refresh' config option
reset: remove 'reset.quiet' config option
reset: do not make '--quiet' disable index refresh
stash: make internal resets quiet and refresh index
reset: suppress '--no-refresh' advice if logging is silenced
reset: replace '--quiet' with '--no-refresh' in performance advice
reset: introduce --[no-]refresh option to --mixed
reset: revise index refresh advice
Diffstat (limited to 't/t3903-stash.sh')
| -rwxr-xr-x | t/t3903-stash.sh | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh index 42638b11d8..4abbc8fcca 100755 --- a/t/t3903-stash.sh +++ b/t/t3903-stash.sh @@ -302,6 +302,18 @@ test_expect_success 'apply -q is quiet' ' test_must_be_empty output.out ' +test_expect_success 'apply --index -q is quiet' ' + # Added file, deleted file, modified file all staged for commit + echo foo >new-file && + echo test >file && + git add new-file file && + git rm other-file && + + git stash && + git stash apply --index -q >output.out 2>&1 && + test_must_be_empty output.out +' + test_expect_success 'save -q is quiet' ' git stash save --quiet >output.out 2>&1 && test_must_be_empty output.out @@ -332,6 +344,27 @@ test_expect_success 'drop -q is quiet' ' test_must_be_empty output.out ' +test_expect_success 'stash push -q --staged refreshes the index' ' + git reset --hard && + echo test >file && + git add file && + git stash push -q --staged && + git diff-files >output.out && + test_must_be_empty output.out +' + +test_expect_success 'stash apply -q --index refreshes the index' ' + echo test >other-file && + git add other-file && + echo another-change >other-file && + git diff-files >expect && + git stash && + + git stash apply -q --index && + git diff-files >actual && + test_cmp expect actual +' + test_expect_success 'stash -k' ' echo bar3 >file && echo bar4 >file2 && |