Re: Git - Pushing to a production website

From: 4jxdq6fqee2h@dyweni.com <4jxdq6fqee2h@dyweni.com>
Date: Jan 10, 2009, 04:46 UTC
Message-ID: <20090109224618.5d8c461c@family.dyweni.com>
In-Reply-To: <200901092238.06968.bss@iguanasuicide.net>

> You could simply commit after running the perl script.  You could
> even commit to a branch so that it's (a little) less likely those
> changes get integrated into master.

How about this, ran by the post-update hook:

For the first update:

 - Do a git pull
 - Then create a new branch 'working' and checkout
 - Apply the patches to 'working' and commit

This leaves 'working' == 'master^'

For subsequent updates:
 - Compare the SHA1 hashes for 'working' and 'master^'.
   - If they don't match, throw an error and exit
 - Assuming they match, checkout 'master' and delete 'working'
 - Do a git pull
 - Then create a new branch 'working' and checkout
 - Apply the patches to 'working' and commit

This would keep the working directory clean and allow future updates to occur, if no one commits anything to git 'working'. If they did, the script would exit and prevent the update requiring the developer to review the commit logs and cherry-pick where necessary.