Git Hooks

Hi,

I have a git repo host at /home/git/blog.git. I have a copy checked out at /var/www/blog. I have a script as follows:

cd /var/www/blog
thin -s 2 -C config.yml -R config.ru stop
git pull origin master
thin -s 2 -C config.yml -R config.ru start

script and the server will update just fine. I wanted to make this automatic so I wrote the following post-receive hook.

if git log -n1 | grep -q "#publish" || git log -n1 | grep -q "#Publish" then
~/bin/update-blog
fi

If #publish is in the commit message then it runs the first script. I found through trial and error that when you use the command git from within a git hook it needs to be executed in a .git directory, so I changed the first script to.

cd /var/www/blog
thin -s 2 -C config.yml -R config.ru stop
cd .git
git pull origin master
cd ..
thin -s 2 -C config.yml -R config.ru start

Everything executes, I see the messages of the server stopping, the new info being pulled, then the server starts again, but the server does not reflect any changes. If I then manually stop the server, use git reset --hard, and then start the server again it works fine.

My only thought is that the cause of this has something to do with git operating differently when you call it from within a hook. Unfortunately, I don't have any thoughts on how to fix it.

View this message in context: http://www.nabble.com/Git-Hooks-tp25482688p25482688.html
Sent from the git mailing list archive at Nabble.com.

Unless you have a strange configuration in which you have work tree files inside a .git directory of another repository, running "git pull" after going into .git directory does not make any sense.

Perhaps add this

unset GIT_DIR

at the very beginning of your original script would make it work better?