unstaged files gone after git reset –hard

by

It’s not clear if you lost files in your working directory, or files in
the index. You say you lost your “unstaged files”, but then you mention
you might have run “git add”. “unstaged files” are lost for good.

Staged files can be recovered with

git fsck --full --unreachable --no-reflog

For each file added there will be a lost blob object, and for each
directory entry there will be a tree object. You would recover your
file changes by doing

git cat-file -p SHA

For each file that you had modified

(master)$ vi bar
(master)$ vi baz
(master)$ vi foo
(master)$ git add foo bar baz
(master)$ git reset --hard HEAD
HEAD is now at ead8fa2 initial
(master)$ git fsck --full --unreachable --no-reflog
Checking object directories: 100% (256/256), done.
unreachable blob 0c29287001b29159f11c4e8a320bce7e9789c00b
unreachable blob 1524d3478e3d0b92866a53239b10bcd4b3838c4d
unreachable blob 97b724e770249816c61d8a526415986208ed7e15
// take a look at one of the objects
(master)git cat-file -p 0c29287001b29159f11c4e8a320bce7e9789c00b
changes for bar
//Here, based on inspecting the output, I can determine that 0c29287 was the file "bar"
(master) git cat-file -p 0c29287 > bar

(note I didn’t get any lost trees when I tested, so this part may not work)

If you modified a whole bunch of files it is probably easier to recover
via the tree object instead of individual files

git read-tree SHA

Where SHA is the lost tree object for the root tree.

More Related Contents:

  1. In plain English, what does “git reset” do?
  2. How do I use ‘git reset –hard HEAD’ to revert to a previous commit? [duplicate]
  3. How to git reset –hard a subdirectory
  4. Can I split an already split hunk with git?
  5. git: How do you add an external directory to the repository?
  6. Git: add vs push vs commit
  7. reset hard on git push
  8. Is there a way to cause git-reflog to show a date alongside each entry?
  9. What is the HEAD in git?
  10. What is the difference between merge –squash and rebase?
  11. What effect does the `–no-ff` flag have for `git merge`?
  12. How can I get the latest tag name in current branch in Git?
  13. How to create a .gitignore file
  14. How to git rebase a branch with the onto command?
  15. Where is git.exe located?
  16. Are Git’s pack files deltas rather than snapshots?
  17. How can I clone all remote branches?
  18. How do I get the hash for the current commit in Git?
  19. What is the git clone –filter option’s syntax?
  20. Should composer.lock be committed to version control?
  21. Rollback a Git merge
  22. What is the difference between git push origin and git push origin master
  23. When I do “git push”, what do the statistics mean? (Total, delta, etc.)
  24. Unable to authenticate with Git Bash to Visual Studio Team Services
  25. git clone hangs forever on github
  26. how to log out of one Github account and use another account?
  27. Set git config values for all child folders
  28. How to push changes to github after jenkins build completes?
  29. Is there a way to compare two diffs or patches?
  30. How to temporarily disable git http proxy

Leave a Comment