diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-08-22 12:34:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-08-22 12:34:11 -0700 |
| commit | 072735ea58407db41c0874fd2f8a91d0c191d49b (patch) | |
| tree | 1179894f8b5414c88bf7874a4510a702b36e8b2d /t/t7600-merge.sh | |
| parent | Merge branch 'sc/pack-refs-deletion-racefix' (diff) | |
| parent | restore: add test for deleted ita files (diff) | |
| download | tgif-072735ea58407db41c0874fd2f8a91d0c191d49b.tar.xz | |
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
Diffstat (limited to 't/t7600-merge.sh')
0 files changed, 0 insertions, 0 deletions