]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'tg/stash-refresh-index'
authorJunio C Hamano <gitster@pobox.com>
Sun, 1 Dec 2019 17:04:37 +0000 (09:04 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 1 Dec 2019 17:04:37 +0000 (09:04 -0800)
Recent update to "git stash pop" made the command empty the index
when run with the "--quiet" option, which has been corrected.

* tg/stash-refresh-index:
  stash: make sure we have a valid index before writing it

1  2 
builtin/stash.c
t/t3903-stash.sh

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