diff options
Diffstat (limited to 'third_party/git/t/t2070-restore.sh')
| -rwxr-xr-x | third_party/git/t/t2070-restore.sh | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/third_party/git/t/t2070-restore.sh b/third_party/git/t/t2070-restore.sh index 076d0df7fc06..2650df196670 100755 --- a/third_party/git/t/t2070-restore.sh +++ b/third_party/git/t/t2070-restore.sh @@ -95,32 +95,4 @@ 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_expect_success 'restore --staged invalidates cache tree for deletions' ' - test_when_finished git reset --hard && - >new1 && - >new2 && - git add new1 new2 && - - # It is important to commit and then reset here, so that the index - # contains a valid cache-tree for the "both" tree. - git commit -m both && - git reset --soft HEAD^ && - - git restore --staged new1 && - git commit -m "just new2" && - git rev-parse HEAD:new2 && - test_must_fail git rev-parse HEAD:new1 -' - test_done |