Merge branch 'nd/switch-and-restore'
authorJunio C Hamano <gitster@pobox.com>
Wed, 22 Jan 2020 23:07:32 +0000 (15:07 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 22 Jan 2020 23:07:32 +0000 (15:07 -0800)
commit09e393d913072d7765b02aba1210d843a83cfbae
treeafb7a732a76346f4c3c9451c446c696326fa104d
parent45f47ff01d048d47f30e0a5cacb5c5768d4858be
parente701bab3e95f7029e59717eab610a544821b2213
Merge branch 'nd/switch-and-restore'

"git restore --staged" did not correctly update the cache-tree
structure, resulting in bogus trees to be written afterwards, which
has been corrected.

* nd/switch-and-restore:
  restore: invalidate cache-tree when removing entries with --staged
builtin/checkout.c
t/t2070-restore.sh