Undo git reset –hard with uncommitted files in the staging area

by

You should be able to recover any files back that you added to the index (e.g, as in your situation, with git add .) although it might be a bit of work. In order to add a file to the index, git adds it to the object database, which means it can be recovered so long as garbage collection hasn’t happened yet. There’s an example of how to do this given in Jakub Narębski’s answer here:

However, I tried that out on a test repository, and there were a couple of problems – --cached should be --cache, and I found that it didn’t actually create the .git/lost-found directory. However, the following steps worked for me:

git fsck --cache --unreachable $(git for-each-ref --format="%(objectname)")

That should output all objects in the object database that aren’t reachable by any ref, in the index, or via the reflog. The output will look something like this:

unreachable blob 907b308167f0880fb2a5c0e1614bb0c7620f9dc3
unreachable blob 72663d3adcf67548b9e0f0b2eeef62bce3d53e03

… and for each of those blobs, you can do:

git show 907b308

To output the contents of the file.

Too much output?

Update in response to sehe‘s comment below:

If you find that you have many commits and trees listed in the output from that command, you may want to remove from the output any objects which are referenced from unreferenced commits. (Typically you can get back to these commits via the reflog anyway – we’re just interested in objects that have been added to the index but can never be found via a commit.)

First, save the output of the command, with:

git fsck --cache --unreachable $(git for-each-ref --format="%(objectname)") > all

Now the object names of those unreachable commits can be found with:

egrep commit all | cut -d ' ' -f 3

So you can find just the trees and objects that have been added to the index, but not committed at any point, with:

git fsck --cache --unreachable $(git for-each-ref --format="%(objectname)") \
  $(egrep commit all | cut -d ' ' -f 3)

That enormously cuts down the number of objects you’ll have to consider.

Update: Philip Oakley below suggests another way of cutting down the number of objects to consider, which is to just consider the most recently modified files under .git/objects. You can find these with:

find .git/objects/ -type f -printf '%TY-%Tm-%Td %TT %p\n' | sort

(I found that find invocation here.) The end of that list might look like:

2011-08-22 11:43:43.0234896770 .git/objects/b2/1700b09c0bc0fc848f67dd751a9e4ea5b4133b
2011-09-13 07:36:37.5868133260 .git/objects/de/629830603289ef159268f443da79968360913a

In which case you can see those objects with:

git show b21700b09c0bc0fc848f67dd751a9e4ea5b4133b
git show de629830603289ef159268f443da79968360913a

(Note that you have to remove the / at the end of the path to get the object name.)

More Related Contents:

  1. Recover files that were added to the index but then removed by a git reset
  2. How do I undo 'git add' before commit?
  3. Message ‘src refspec master does not match any’ when pushing commits in Git
  4. Removing multiple files from a Git repo that have already been deleted from disk
  5. git undo all uncommitted or unsaved changes
  6. Removing multiple files from a Git repo that have already been deleted from disk
  7. How can I revert uncommitted changes including files and folders?
  8. What is difference between ‘git reset –hard HEAD~1’ and ‘git reset –soft HEAD~1’?
  9. Can I delete a git commit but keep the changes?
  10. Move existing, uncommitted work to a new branch in Git
  11. Commit only part of a file in Git
  12. How do I push amended commit to the remote Git repository?
  13. How do I use ‘git reset –hard HEAD’ to revert to a previous commit? [duplicate]
  14. What are the differences between “git commit” and “git push”?
  15. Link to the issue number on GitHub within a commit message
  16. git: Your branch is ahead by X commits
  17. What is a Git commit ID?
  18. What is the `git restore` command and what is the difference between `git restore` and `git reset`?
  19. What’s the difference between `git add .` and `git add -u`?
  20. How to change the commit author for a single commit?
  21. Remove file from latest commit
  22. How to amend several commits in Git to change author
  23. How to amend a commit without changing commit message (reusing the previous one)?
  24. Accidentally pushed commit: change git commit message
  25. Why git can’t do hard/soft resets by path?
  26. How can I undo a `git commit` locally and on a remote after `git push`
  27. Remove a git commit which has not been pushed
  28. Xcode 9 commit: Couldn’t communicate with helper application
  29. Why does ‘git commit’ not save my changes?
  30. Is it possible to set a git commit to have a timestamp prior to 1970?

Leave a Comment