diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-05-16 14:05:24 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-05-16 14:05:24 +0200 |
| commit | a8a2491e629f9f886705d8bca6e134cd15076810 (patch) | |
| tree | 7ddad481b9dd099ac6ce983c2fae4c14d0772aef /t/t3905-stash-include-untracked.sh | |
| parent | Merge branch 'wc/packed-ref-removal-cleanup' (diff) | |
| parent | stash show: fix segfault with --{include,only}-untracked (diff) | |
| download | git-a8a2491e629f9f886705d8bca6e134cd15076810.tar.xz git-a8a2491e629f9f886705d8bca6e134cd15076810.zip | |
Merge branch 'dl/stash-show-untracked-fixup'
The code to handle options recently added to "git stash show"
around untracked part of the stash segfaulted when these options
were used on a stash entry that does not record untracked part.
* dl/stash-show-untracked-fixup:
stash show: fix segfault with --{include,only}-untracked
t3905: correct test title
Diffstat (limited to 't/t3905-stash-include-untracked.sh')
| -rwxr-xr-x | t/t3905-stash-include-untracked.sh | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/t/t3905-stash-include-untracked.sh b/t/t3905-stash-include-untracked.sh index 8314ab21d4..5bed8fd2fd 100755 --- a/t/t3905-stash-include-untracked.sh +++ b/t/t3905-stash-include-untracked.sh @@ -367,7 +367,7 @@ test_expect_success 'stash show --only-untracked only shows untracked files' ' test_cmp expect actual ' -test_expect_success 'stash show --no-include-untracked cancels --{include,show}-untracked' ' +test_expect_success 'stash show --no-include-untracked cancels --{include,only}-untracked' ' git reset --hard && git clean -xf && >untracked && @@ -405,4 +405,19 @@ test_expect_success 'stash show --include-untracked errors on duplicate files' ' test_i18ngrep "worktree and untracked commit have duplicate entries: tracked" err ' +test_expect_success 'stash show --{include,only}-untracked on stashes without untracked entries' ' + git reset --hard && + git clean -xf && + >tracked && + git add tracked && + git stash && + + git stash show >expect && + git stash show --include-untracked >actual && + test_cmp expect actual && + + git stash show --only-untracked >actual && + test_must_be_empty actual +' + test_done |