]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4a60c63 e701bab)
Merge branch 'nd/switch-and-restore' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 14 Feb 2020 20:42:29 +0000 (12:42 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 14 Feb 2020 20:42:29 +0000 (12:42 -0800)
commite361f36f61b664a36db1d34c3f9e3427ac42656d
tree3a34e8dbb31faa251fd7865a8b0aebef76dd3ff7tree | snapshot
parent4a60c63a75e546005b1c1222ae85ea504a0ee852commit | diff
parente701bab3e95f7029e59717eab610a544821b2213commit | diff
Merge branch 'nd/switch-and-restore' into maint

"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 diff1 | diff2 | blob | history
t/t2070-restore.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.