On Friday 09 January 2009, 4jxDQ6FQee2H@xxxxxxxxxx wrote about 'Re: Git - Pushing to a production website': >> > - Do a git pull >> >> I'm not enitirely sure you want post-update doing the pull. > >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'. Ah. I was assuming you were "git pull"ing in the repository that the hook was running from. In this case you are "git pull"ing in a different repository, which should be fine. >> >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'. Yes, which means working^ == master. commit-ish^ means the first parent of commit-ish commit-ish^2 means the second parent of commit-ish commit-ish~2 means the "first grandparent" of commit-ish >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. As would: - git rev-parse master - git rev-parse working^ -- Boyd Stephen Smith Jr. ,= ,-_-. =. bss@xxxxxxxxxxxxxxxxx ((_/)o o(\_)) ICQ: 514984 YM/AIM: DaTwinkDaddy `-'(. .)`-' http://iguanasuicide.net/ \_/
Attachment:
signature.asc
Description: This is a digitally signed message part.
