From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 22 Aug 2019 19:34:11 +0000 (-0700)
Subject: Merge branch 'vn/restore-empty-ita-corner-case-fix'
X-Git-Tag: v2.24.0-rc0~167
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=072735ea58407db41c0874fd2f8a91d0c191d49b;p=thirdparty%2Fgit.git

Merge branch 'vn/restore-empty-ita-corner-case-fix'

"git checkout" and "git restore" to re-populate the index from a
tree-ish (typically HEAD) did not work correctly for a path that
was removed and then added again with the intent-to-add bit, when
the corresponding working tree file was empty.  This has been
corrected.

* vn/restore-empty-ita-corner-case-fix:
  restore: add test for deleted ita files
  checkout.c: unstage empty deleted ita files
---

072735ea58407db41c0874fd2f8a91d0c191d49b