Re: Git - Pushing to a production website

From: 4jxdq6fqee2h@dyweni.com <4jxdq6fqee2h@dyweni.com>
Date: Jan 10, 2009, 05:30 UTC
Message-ID: <20090109233037.31198694@family.dyweni.com>
In-Reply-To: <200901092304.51986.bss@iguanasuicide.net>

> > - Do a git pull  
> 
> I'm not enitirely sure you want post-update doing the pull.

Really?

Let's say the website lives in /srv/www/htdocs Let's also say the git repository lives in /srv/www/git

All developers pull/push from /srv/www/git  (git@server:/srv/www/git)

The website is a clone of /srv/www/git and only tracks 'master'. Post-update (simplified) changes to /srv/www/htdocs and does 'git pull'.

I'm referencing this article:
  http://jblevins.org/log/tools/managing-websites-with-git

Would you recommend a different way to automatically push any changes to 'master' down to the website?

Show 7 quoted lines

> 
> > - Then create a new branch 'working' and checkout
> > - Apply the patches to 'working' and commit
> >
> >This leaves 'working' == 'master^'  
> 
> Actually, it leaves HEAD == working and master == working^.

I'm sorry - I mixed up my terminology.

I am referring to the branch's log.

'working' has 1 more log entry than 'master'.

Example:
 - git log master | grep ^commit | tail -n 2 | head -n 1
 - git log working | grep ^commit | tail -n 1 | head -n 1

Both of these commands should return the same commit hash.