diff options
| author | Varun Naik <vcnaik94@gmail.com> | 2019-08-01 09:09:10 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-08-02 10:28:25 -0700 |
| commit | 620c09e1b686e06c4ddbd5fb153f7ad898bab412 (patch) | |
| tree | 1585936299a88a4519e4af7e7dfc1d030cecd753 | |
| parent | ecd72042de7d79c05d8f153e288766c7f88f0b10 (diff) | |
| download | git-620c09e1b686e06c4ddbd5fb153f7ad898bab412.tar.xz | |
restore: add test for deleted ita files
`git restore --staged` uses the same machinery as `git checkout HEAD`,
so there should be a similar test case for "restore" as the existing
test case for "checkout" with deleted ita files.
Helped-by: Jeff King <peff@peff.net>
Signed-off-by: Varun Naik <vcnaik94@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t2070-restore.sh | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/t/t2070-restore.sh b/t/t2070-restore.sh index 2650df1966..21c3f84459 100755 --- a/t/t2070-restore.sh +++ b/t/t2070-restore.sh @@ -95,4 +95,15 @@ test_expect_success 'restore --ignore-unmerged ignores unmerged entries' ' ) ' +test_expect_success 'restore --staged adds deleted intent-to-add file back to index' ' + echo "nonempty" >nonempty && + >empty && + git add nonempty empty && + git commit -m "create files to be deleted" && + git rm --cached nonempty empty && + git add -N nonempty empty && + git restore --staged nonempty empty && + git diff --cached --exit-code +' + test_done |