git restore deleted file- Find and restore a deleted file in a Git repository

Question

Say I'm in a Git repository. I delete a file and commit that change. I continue working and make some more commits. Then, I find I need to restore that file.

I know I can check out a file using git checkout HEAD^ foo.bar, but I don't really know when that file was deleted.

1. What would be the quickest way to find the commit that deleted a given filename?
2. What would be the easiest way to get that file back into my working copy?

I'm hoping I don't have to manually browse my logs, check out the entire project for a given SHA and then manually copy that file into my original project checkout.

Answer 1

Find the last commit that produced an error to the given path. As the file isn't in the HEAD commit, this commit must have deleted the file.

git rev-list -n 1 HEAD -- <file_path>

Then check out the version at the commit before, using the caret (^) symbol:

git checkout <deleting_commit>^ -- <file_path>

Or in one command, if $file is the file in question.

git checkout $(git rev-list -n 1 HEAD -- "$file")^ -- "$file"

If you are using zsh and have the EXTENDED_GLOB option enabled, the caret symbol won't work. You can use ~1 instead.

git checkout $(git rev-list -n 1 HEAD -- "$file")~1 -- "$file"