删除运行git rm --cached后无法恢复文件

时间:2018-09-12 20:54:10

标签: git ubuntu

运行git rm --cached后,我无法恢复意外删除的文件。我曾尝试过进行git reset复位以及其他几种方法,但是没有帮助

[ec2-user@ip-10-0-0-190 cgsignlab]$ git rm --cached .
fatal: not removing '.' recursively without -r
You have new mail in /var/spool/mail/ec2-user
[ec2-user@ip-10-0-0-190 cgsignlab]$ git rm --cached . -r
error: 'vendor/apix/log' has staged content different from both the file     and the HEAD
(use -f to force removal)
error: 'vendor/aws/aws-sdk-php' has staged content different from both the     file and the HEAD
(use -f to force removal)
error: 'vendor/guzzlehttp/guzzle' has staged content different from both the file and the HEAD
(use -f to force removal)
error: 'vendor/guzzlehttp/promises' has staged content different from both     the file and the HEAD
(use -f to force removal)
error: 'vendor/guzzlehttp/psr7' has staged content different from both the file and the HEAD
(use -f to force removal) 
error: 'vendor/nategood/httpful' has staged content different from both the    file and the HEAD
(use -f to force removal)
error: 'vendor/nicolab/php-ftp-client' has staged content different from both the file and the HEAD
(use -f to force removal)
error: 'vendor/psr/http-message' has staged content different from both      the file and the HEAD 
(use -f to force removal)
error: 'vendor/psr/log' has staged content different from both the file and the HEAD
(use -f to force removal)
[ec2-user@ip-10-0-0-190 cgsignlab]$ git reset HEAD .
fatal: ambiguous argument 'HEAD': unknown revision or path not in the  working   tree.
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'


[ec2-user@ip-10-0-0-190 cgsignlab]$ git status
# HEAD detached at 04e2948
nothing to commit, working directory clean
You have mail in /var/spool/mail/ec2-user
[ec2-user@ip-10-0-0-190 cgsignlab]$ 

这些是我需要还原任何帮助的文件,

# Changes to be committed:
#   (use "git rm --cached <file>..." to unstage)
#
#   new file:   art.php
#   new file:   ceil.php
#   new file:   composer.json
#   new file:   composer.lock
#   new file:   metaupdate.php
#   new file:   movetoreview.php
#   new file:   orders.php
#   new file:   shipments.php
#   new file:   shipments/tracking.csv
#   new file:   src/CG/Aws/S3/Client.php
#   new file:   src/CG/OrderDesk/RestApi.php
#   new file:   src/CG/Orders/Order.php
#   new file:   src/CG/Orders/OrderDetails.php
#   new file:   src/CG/Orders/RestApi.php
#   new file:   src/CG/Orders/ShipMethods.php
#   new file:   src/CG/PitchPrint/RestApi.php
#   new file:   src/CG/Shipments/TrackingAdapter.php
#   new file:   src/CG/SignLab/ImageFormatter.php
#   new file:   src/CG/SignLab/Products.php
#   new file:   src/CG/SignLab/Utils.php

需要更多注释,因此这不是全部代码,而是需要发布相关日志

[ec2-user@ip-10-0-0-190 cgsignlab]$ git status
# On branch master
#
# Initial commit
#
# Changes to be committed:
#   (use "git rm --cached <file>..." to unstage)
#
#   new file:   art.php
#   new file:   ceil.php
#   new file:   composer.json
#   new file:   composer.lock
#   new file:   metaupdate.php
#   new file:   movetoreview.php
#   new file:   orders.php
#   new file:   shipments.php
#   new file:   shipments/tracking.csv
#   new file:   src/CG/Aws/S3/Client.php
#   new file:   src/CG/OrderDesk/RestApi.php
#   new file:   src/CG/Orders/Order.php
#   new file:   src/CG/Orders/OrderDetails.php
#   new file:   src/CG/Orders/RestApi.php
#   new file:   src/CG/Orders/ShipMethods.php
#   new file:   src/CG/PitchPrint/RestApi.php
#   new file:   src/CG/Shipments/TrackingAdapter.php
#   new file:   src/CG/SignLab/ImageFormatter.php
#   new file:   src/CG/SignLab/Products.php
#   new file:   src/CG/SignLab/Utils.php
#   new file:   vendor/apix/log
#   new file:   vendor/autoload.php
#   new file:   vendor/automattic/woocommerce/.editorconfig
#   new file:   vendor/automattic/woocommerce/.gitignore

#   new file:   vendor/mtdowling/jmespath.php/tests/compliance/wildcard.json
#   new file:   vendor/nategood/httpful
#   new file:   vendor/nicolab/php-ftp-client
#   new file:   vendor/psr/http-message
#   new file:   vendor/psr/log
#
[ec2-user@ip-10-0-0-190 cgsignlab]$ git reset HEAD 

1 个答案:

答案 0 :(得分:2)

git fsck在这里可能会有所帮助:

git fsck --unreachable

这应该输出哈希列表(可能比您删除的列表更多)。然后使用这些哈希值来获取其内容:

git cat-file -p <hash>

不幸的是,您不会获得文件名,而只会得到其内容。