Roll back git repository with deployment hook

Question

I have a bare git repository set up on a production server, and it uses a post receive hook to deploy whatever I push there:

#!/bin/sh
GIT_WORK_TREE=/path/to/webroot git checkout -f

To deploy I do

git push production

From my work station, and everything is taken care of. But say I push a commit that breaks something and I want to revert asap. Will doing the following work:

git push production [id of commit to revert to]:master

IE will this still deploy everything in to the webroot correctly?

Answer 1

That should work as expected. You probably need to do git push +<commit>:master (note the +) in order to replace the bad commit at the HEAD of production master.

+<commit>:master is a refspec, see the git push manpage for more information about refspecs.

I would recommend reverting more explicitly without needing to force push to the production server by doing:

git revert <commit to revert>
git push production

or

git reset --hard <commit to revert to>
git push -f production

See How to revert Git repository to a previous commit?