]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 207ad3c 620c09e)
Merge branch 'vn/restore-empty-ita-corner-case-fix'
authorJunio C Hamano <gitster@pobox.com>
Thu, 22 Aug 2019 19:34:11 +0000 (12:34 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 22 Aug 2019 19:34:11 +0000 (12:34 -0700)
commit072735ea58407db41c0874fd2f8a91d0c191d49b
tree1179894f8b5414c88bf7874a4510a702b36e8b2dtree | snapshot
parent207ad3cb203b7adeeb52b5372ace497e20739d49commit | diff
parent620c09e1b686e06c4ddbd5fb153f7ad898bab412commit | diff
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
builtin/checkout.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.