]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'dl/stash-show-untracked-fixup'
authorJunio C Hamano <gitster@pobox.com>
Sun, 16 May 2021 12:05:24 +0000 (21:05 +0900)
committerJunio C Hamano <gitster@pobox.com>
Sun, 16 May 2021 12:05:24 +0000 (21:05 +0900)
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

1  2 
builtin/stash.c
t/t3905-stash-include-untracked.sh

diff --cc builtin/stash.c
Simple merge
Simple merge