Question
I accidentally committed a file to my git repo that was corrupt. The corruption happened when I was working on my laptop and the batteries died down. I didn't recognize at once that this ended up in a file which consisted of weird symbols only. However, I committed it to my repo.
Now I managed to revert to the previous non-corrupt version by using git revert HEAD^ and I have a non-corrupted version of the file. So far so good.
However, the log shows me that the corrupted file is still in the tree of my repo. My question now: Is this problematic, or can I forget about it? Is there a way to erase that corrupt commit/file out of the repo?
Solution
if you have not pushed the changes, git revert is probably not what you want. It makes a new commit that reverses the changes made.
Use git reset --hard <last good commit> to remove the bad commit. You can address this commit with a HEAD reference as you did, but that will not adjust the commits in the branch. If you reference the last known good commit with the branch name, such as git reset --hard <branch>~2 to reference 2 commits prior to the current one.
OTHER TIPS
To roll back to a previous commit, use
https://stackoverflow.com/questions/15604327
italiano
english
français
española
中国
日本の
العربية
Deutsch
한국어
Português
Russiangit reset --hard <commit>
Assuming you are currently on a branch, this will set the branch head to the specified commit, and checkout your work tree to that commit. This will destroy any uncommitted changes!
If you later want to undo that, you can use git reflog to find the previous commit ID.
In general it is not a good idea to rewrite history. In public projects this may be the cause of weird corruption in threads if one developer managed to get the original tree before it was rewritten.
However for private branches you might want to rewrite history and hide mistakes before merging with the master.
Look at:
How do I push amended commit to the remote Git repository?
also here:
Please don't. git reset --mixed <good-commit> (--mixed is the default) keeps the workspace files as they are now, and resets the history git has stored to that <good-commit>. Then you can fix that up (correcting your corrupt file) and git commit to get to (presumably) the state you wanted in the first place.
