diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-05-22 18:29:01 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-05-22 18:29:01 +0900 |
| commit | 378c7c6ad48c4ccddf9b534616a0e86f28440bd3 (patch) | |
| tree | 943e2a67526de9ca0cf0996fa365178486cc0f73 /t | |
| parent | Merge branch 'jh/simple-ipc-sans-pthread' (diff) | |
| parent | stash show: use stash.showIncludeUntracked even when diff options given (diff) | |
| download | git-378c7c6ad48c4ccddf9b534616a0e86f28440bd3.tar.gz git-378c7c6ad48c4ccddf9b534616a0e86f28440bd3.zip | |
Merge branch 'dl/stash-show-untracked-fixup'
Another brown paper bag inconsistency fix for a new feature
introduced during this cycle.
* dl/stash-show-untracked-fixup:
stash show: use stash.showIncludeUntracked even when diff options given
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3905-stash-include-untracked.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/t/t3905-stash-include-untracked.sh b/t/t3905-stash-include-untracked.sh index 5bed8fd2fd..dd2cdcc114 100755 --- a/t/t3905-stash-include-untracked.sh +++ b/t/t3905-stash-include-untracked.sh @@ -333,6 +333,8 @@ test_expect_success 'stash show --include-untracked shows untracked files' ' git stash show -p --include-untracked >actual && test_cmp expect actual && git stash show --include-untracked -p >actual && + test_cmp expect actual && + git -c stash.showIncludeUntracked=true stash show -p >actual && test_cmp expect actual ' |