Deploy a project using Git push

Question

Is it possible to deploy a website using git push  I have a hunch it has something to do with using git hooks to perform a git reset --hard on the server side  but how would I go about accomplishing this

User · Answer

The way I do it is I have a bare Git repository on my deployment server where I push changes  Then I log in to the deployment server  change to the actual web server docs directory  and do a git pull  I don t use any hooks to try to do this automatically  that seems like more trouble than it s worth

User · Answer

Update  I m now using Lloyd Moore solution with the key agent ssh -A      Pushing to a main repo and then pulling from it in parallel from all your machines is a bit faster and requires less setup on those machines     Not seeing this solution here  just push via ssh if git is installed on the server   You ll need the following entry in your local  git config   remote  amazon       url   amazon  path to project git     fetch    refs heads   refs remotes amazon     But hey  whats that with amazon   In your local    ssh config you ll need to add the following entry   Host amazon     Hostname  lt YOUR IP gt      User  lt USER gt      IdentityFile    ssh amazon-private-key   now you can call  git push amazon master ssh  lt USER gt   lt YOUR IP gt   cd  path to project  amp  amp  git pull     BTW   path to project git is different to the actual working directory  path to project

User · Answer

dont install git on a server or copy the  git folder there  to update a server from a git clone you can use following command   git ls-files -z   rsync --files-from - --copy-links -av0   user server com  var www project   you might have to delete files which got removed from the project   this copies all the checked in files  rsync uses ssh which is installed on a server anyways   the less software you have installed on a server the more secure he is and the easier it is to manage it s configuration and document it  there is also no need to keep a complete git clone on the server  it only makes it more complex to secure everything properly

User · Answer

We use capistrano for managing deploy  We build capistrano to deploy on a staging server  and then running a rsync with all of ours server   cap deploy cap deploy start rsync  when the staging is ok    With capistrano  we can made easy rollback in case of bug   cap deploy rollback cap deploy start rsync

User · Answer

Sounds like you should have two copies on your server  A bare copy  that you can push pull from  which your would push your changes when you re done  and then you would clone this into you web directory and set up a cronjob to update git pull from your web directory every day or so

User · Answer

In essence all you need to do are the following   server    1 branch    2 git push  server  branch ssh  lt username gt   server  cd  path to www  git pull    I have those lines in my application as an executable called deploy   so when I want to do a deploy I type   deploy myserver mybranch

User · Answer

Sounds like you should have two copies on your server  A bare copy  that you can push pull from  which your would push your changes when you re done  and then you would clone this into you web directory and set up a cronjob to update git pull from your web directory every day or so

User · Answer

As complementary answer I would like to offer an alternative  I m using git-ftp and it works fine   https   github com git-ftp git-ftp  Easy to use  only type      git ftp push   and git will automatically upload project files   Regards

User · Answer

In essence all you need to do are the following   server    1 branch    2 git push  server  branch ssh  lt username gt   server  cd  path to www  git pull    I have those lines in my application as an executable called deploy   so when I want to do a deploy I type   deploy myserver mybranch

User · Answer

You could conceivably set up a git hook that when say a commit is made to say the  stable  branch it will pull the changes and apply them to the PHP site  The big downside is you won t have much control if something goes wrong and it will add time to your testing - but you can get an idea of how much work will be involved when you merge say your trunk branch into the stable branch to know how many conflicts you may run into  It will be important to keep an eye on any files that are site specific  eg  configuration files  unless you solely intend to only run the one site   Alternatively have you looked into pushing the change to the site instead   For information on git hooks see the githooks documentation

User · Answer

The way I do it is I have a bare Git repository on my deployment server where I push changes  Then I log in to the deployment server  change to the actual web server docs directory  and do a git pull  I don t use any hooks to try to do this automatically  that seems like more trouble than it s worth

User · Answer

git config --local receive denyCurrentBranch updateInstead  Added in Git 2 3  this could be a good possibility  https   github com git git blob v2 3 0 Documentation config txt L2155  You set it on the server repository  and it also updates the working tree if it is clean   There have been further improvements in 2 4 with the push-to-checkout hook and handling of unborn branches   Sample usage   git init server cd server touch a git add   git commit -m 0 git config --local receive denyCurrentBranch updateInstead  cd    git clone server local cd local touch b git add   git commit -m 1 git push origin master master  cd    server ls   Output   a b   This does have the following shortcomings mentioned on the GitHub announcement    Your server will contain a  git directory containing the entire history of your project  You probably want to make extra sure that it cannot be served to users  During deploys  it will be possible for users momentarily to encounter the site in an inconsistent state  with some files at the old version and others at the new version  or even half-written files  If this is a problem for your project  push-to-deploy is probably not for you  If your project needs a  build  step  then you will have to set that up explicitly  perhaps via githooks    But all of those points are out of the scope of Git and must be taken care of by external code  So in that sense  this  together with Git hooks  are the ultimate solution

User · Answer

For Deployment Scenario  In our scenario we re storing the code on github bitbucket and want to deploy to live servers  In this case the following combination works for us  that is a remix of the highly upvoted answers here     Copy over your  git directory to your web server On your local copy git remote add live ssh   user host port folder On remote  git config receive denyCurrentBranch ignore On remote  nano  git hooks post-receive and add this content      bin sh GIT WORK TREE  var www vhosts example org git checkout -f On remote  chmod  x  git hooks post-receive Now you can push there with git push live   Notes   This solution works with older git versions  tested with 1 7 and 1 9  You need to make sure pushing to github bitbucket first  so you ll have a consistent repo on live If your  git folder is within document root make sure you hide it from the outside by adding to  htaccess  source    RedirectMatch 404

User · Answer

You could conceivably set up a git hook that when say a commit is made to say the  stable  branch it will pull the changes and apply them to the PHP site  The big downside is you won t have much control if something goes wrong and it will add time to your testing - but you can get an idea of how much work will be involved when you merge say your trunk branch into the stable branch to know how many conflicts you may run into  It will be important to keep an eye on any files that are site specific  eg  configuration files  unless you solely intend to only run the one site   Alternatively have you looked into pushing the change to the site instead   For information on git hooks see the githooks documentation

User · Answer

I ended up creating my own rudimentary deployment tool which would automatically pull down new updates from the repo - https   github com jesalg SlimJim - Basically it listens to the github post-receive-hook and uses a proxy to trigger an update script

User · Answer

dont install git on a server or copy the  git folder there  to update a server from a git clone you can use following command   git ls-files -z   rsync --files-from - --copy-links -av0   user server com  var www project   you might have to delete files which got removed from the project   this copies all the checked in files  rsync uses ssh which is installed on a server anyways   the less software you have installed on a server the more secure he is and the easier it is to manage it s configuration and document it  there is also no need to keep a complete git clone on the server  it only makes it more complex to secure everything properly

User · Answer

Giddyup are language-agnostic just-add-water git hooks to automate deployment via git push  It also allows you to have custom start stop hooks for restarting web server  warming up cache etc   https   github com mpalmer giddyup  Check out examples

User · Answer

We use capistrano for managing deploy  We build capistrano to deploy on a staging server  and then running a rsync with all of ours server   cap deploy cap deploy start rsync  when the staging is ok    With capistrano  we can made easy rollback in case of bug   cap deploy rollback cap deploy start rsync

User · Answer

Sounds like you should have two copies on your server  A bare copy  that you can push pull from  which your would push your changes when you re done  and then you would clone this into you web directory and set up a cronjob to update git pull from your web directory every day or so

User · Answer

I found this script on this site and it seems to work quite well    Copy over your  git directory to your web server On your local copy  modify your  git config file and add your web server as a remote    remote  production       url   username webserver  path to htdocs  git  On the server  replace  git hooks post-update with this file  in the answer below  Add execute access to the file  again  on the server    chmod  x  git hooks post-update  Now  just locally push to your web server and it should automatically update the working copy   git push production

User · Answer

As complementary answer I would like to offer an alternative  I m using git-ftp and it works fine   https   github com git-ftp git-ftp  Easy to use  only type      git ftp push   and git will automatically upload project files   Regards

User · Answer

I found this script on this site and it seems to work quite well    Copy over your  git directory to your web server On your local copy  modify your  git config file and add your web server as a remote    remote  production       url   username webserver  path to htdocs  git  On the server  replace  git hooks post-update with this file  in the answer below  Add execute access to the file  again  on the server    chmod  x  git hooks post-update  Now  just locally push to your web server and it should automatically update the working copy   git push production

User · Answer

After many false starts and dead ends  I m finally able to deploy website code with just  git push remote  thanks to this article    The author s post-update script is only one line long and his solution doesn t require  htaccess configuration to hide the Git repo as some others do     A couple of stumbling blocks if you re deploying this on an Amazon EC2 instance    1  If you use sudo to create the bare destination repository  you have to change the owner of the repo to ec2-user or the push will fail   Try  chown ec2-user ec2-user repo     2  The push will fail if you don t pre-configure the location of your amazon-private-key pem  either in  etc ssh ssh config as an IdentityFile parameter or in    ssh config using the   Host  - HostName - IdentityFile - User  layout described here         HOWEVER if Host is configured in    ssh config and different than HostName the Git push will fail    That s probably a Git bug

User · Answer

Sounds like you should have two copies on your server  A bare copy  that you can push pull from  which your would push your changes when you re done  and then you would clone this into you web directory and set up a cronjob to update git pull from your web directory every day or so

User · Answer

After many false starts and dead ends  I m finally able to deploy website code with just  git push remote  thanks to this article    The author s post-update script is only one line long and his solution doesn t require  htaccess configuration to hide the Git repo as some others do     A couple of stumbling blocks if you re deploying this on an Amazon EC2 instance    1  If you use sudo to create the bare destination repository  you have to change the owner of the repo to ec2-user or the push will fail   Try  chown ec2-user ec2-user repo     2  The push will fail if you don t pre-configure the location of your amazon-private-key pem  either in  etc ssh ssh config as an IdentityFile parameter or in    ssh config using the   Host  - HostName - IdentityFile - User  layout described here         HOWEVER if Host is configured in    ssh config and different than HostName the Git push will fail    That s probably a Git bug

User · Answer

Using the post-update file below    Copy over your  git directory to your web server On your local copy  modify your  git config file and add your web server as a remote    remote  production       url   username webserver  path to htdocs  git  On the server  replace  git hooks post-update with file below Add execute access to the file  again  on the server    chmod  x  git hooks post-update  Now  just locally push to your web server and it should automatically update the working copy   git push production       bin sh     This hook does two things       1  update the  info  files that allow the list of references to be       queries over dumb transports such as http      2  if this repository looks like it is a non-bare repository  and       the checked-out branch is pushed to  then update the working copy        This makes  push  function somewhat similarly to darcs and bzr      To enable this hook  make this file executable by  chmod  x post-update    git-update-server-info  is bare   git-config --get --bool core bare   if   -z   is bare    then         for compatibility s sake  guess       git dir full   cd  GIT DIR  pwd        case  git dir full in    git  is bare false      is bare true   esac fi  update wc           ref  1       echo  Push to checked out branch  ref   gt  amp 2       if     -f  GIT DIR logs HEAD         then              echo  E push to non-bare repository requires a HEAD reflog   gt  amp 2              exit 1       fi       if  cd  GIT WORK TREE  git-diff-files -q --exit-code  gt  dev null        then              wc dirty 0       else              echo  W unstaged changes found in working copy   gt  amp 2              wc dirty 1              desc  working copy        fi       if git diff-index --cached HEAD  1   gt  dev null       then              index dirty 0       else              echo  W uncommitted  staged changes found   gt  amp 2              index dirty 1              if   -n   desc                 then                    desc   desc and index               else                    desc  index               fi       fi       if     wc dirty  -ne 0 -o   index dirty  -ne 0         then              new   git rev-parse HEAD               echo  W stashing dirty  desc - see git-stash 1    gt  amp 2                trap  echo trapped     git symbolic-ref HEAD     ref     2 3 13 15 ERR EXIT              git-update-ref --no-deref HEAD HEAD  1               cd  GIT WORK TREE              git stash save  dirty  desc before update to  new                git-symbolic-ref HEAD   ref                       fi          eye candy - show the WC updates          echo  Updating working copy   gt  amp 2        cd  GIT WORK TREE       git-diff-index -R --name-status HEAD  gt  amp 2       git-reset --hard HEAD     if     is bare     false    then       active branch  git-symbolic-ref HEAD        export GIT DIR   cd  GIT DIR  pwd        GIT WORK TREE   GIT WORK TREE-          for ref       do              if     ref      active branch                 then                    update wc  ref              fi       done fi

User · Answer

Update  I m now using Lloyd Moore solution with the key agent ssh -A      Pushing to a main repo and then pulling from it in parallel from all your machines is a bit faster and requires less setup on those machines     Not seeing this solution here  just push via ssh if git is installed on the server   You ll need the following entry in your local  git config   remote  amazon       url   amazon  path to project git     fetch    refs heads   refs remotes amazon     But hey  whats that with amazon   In your local    ssh config you ll need to add the following entry   Host amazon     Hostname  lt YOUR IP gt      User  lt USER gt      IdentityFile    ssh amazon-private-key   now you can call  git push amazon master ssh  lt USER gt   lt YOUR IP gt   cd  path to project  amp  amp  git pull     BTW   path to project git is different to the actual working directory  path to project

User · Answer

git config --local receive denyCurrentBranch updateInstead  Added in Git 2 3  this could be a good possibility  https   github com git git blob v2 3 0 Documentation config txt L2155  You set it on the server repository  and it also updates the working tree if it is clean   There have been further improvements in 2 4 with the push-to-checkout hook and handling of unborn branches   Sample usage   git init server cd server touch a git add   git commit -m 0 git config --local receive denyCurrentBranch updateInstead  cd    git clone server local cd local touch b git add   git commit -m 1 git push origin master master  cd    server ls   Output   a b   This does have the following shortcomings mentioned on the GitHub announcement    Your server will contain a  git directory containing the entire history of your project  You probably want to make extra sure that it cannot be served to users  During deploys  it will be possible for users momentarily to encounter the site in an inconsistent state  with some files at the old version and others at the new version  or even half-written files  If this is a problem for your project  push-to-deploy is probably not for you  If your project needs a  build  step  then you will have to set that up explicitly  perhaps via githooks    But all of those points are out of the scope of Git and must be taken care of by external code  So in that sense  this  together with Git hooks  are the ultimate solution

User · Answer

I am using the following solution by toroid org  which has a simpler hook script    on the server      mkdir website git  amp  amp  cd website git   git init --bare Initialized empty Git repository in  home ams website git    and install the hook on the server      mkdir  var www www example org   cat  gt  hooks post-receive    bin sh GIT WORK TREE  var www www example org git checkout -f GIT WORK TREE  var www www git clean -f -d   clean directory from removed files    chmod  x hooks post-receive   on your client      mkdir website  amp  amp  cd website   git init Initialized empty Git repository in  home ams website  git    echo  Hello  world    gt  index html   git add index html   git commit -q -m  The humble beginnings of my web site      git remote add web ssh   server example org home ams website git   git push web  master refs heads master   then to publish  just type    git push web   There is a full description on the website  http   toroid org ams git-website-howto

User · Answer

For Deployment Scenario  In our scenario we re storing the code on github bitbucket and want to deploy to live servers  In this case the following combination works for us  that is a remix of the highly upvoted answers here     Copy over your  git directory to your web server On your local copy git remote add live ssh   user host port folder On remote  git config receive denyCurrentBranch ignore On remote  nano  git hooks post-receive and add this content      bin sh GIT WORK TREE  var www vhosts example org git checkout -f On remote  chmod  x  git hooks post-receive Now you can push there with git push live   Notes   This solution works with older git versions  tested with 1 7 and 1 9  You need to make sure pushing to github bitbucket first  so you ll have a consistent repo on live If your  git folder is within document root make sure you hide it from the outside by adding to  htaccess  source    RedirectMatch 404

User · Answer

The way I do it is I have a bare Git repository on my deployment server where I push changes  Then I log in to the deployment server  change to the actual web server docs directory  and do a git pull  I don t use any hooks to try to do this automatically  that seems like more trouble than it s worth

User · Answer

The way I do it is I have a bare Git repository on my deployment server where I push changes  Then I log in to the deployment server  change to the actual web server docs directory  and do a git pull  I don t use any hooks to try to do this automatically  that seems like more trouble than it s worth

User · Answer

Giddyup are language-agnostic just-add-water git hooks to automate deployment via git push  It also allows you to have custom start stop hooks for restarting web server  warming up cache etc   https   github com mpalmer giddyup  Check out examples

User · Answer

Given an environment where you have multiple developers accessing the same repository the following guidelines may help   Ensure that you have a unix group that all devs belong to and give ownership of the  git repository to that group    In the  git config of the server repository set sharedrepository   true   This tells git to allow multiple users which is needed for commits and deployment  set the umask of each user in their bashrc files to be the same - 002 is a good start

User · Answer

I found this script on this site and it seems to work quite well    Copy over your  git directory to your web server On your local copy  modify your  git config file and add your web server as a remote    remote  production       url   username webserver  path to htdocs  git  On the server  replace  git hooks post-update with this file  in the answer below  Add execute access to the file  again  on the server    chmod  x  git hooks post-update  Now  just locally push to your web server and it should automatically update the working copy   git push production

User · Answer

I am using the following solution by toroid org  which has a simpler hook script    on the server      mkdir website git  amp  amp  cd website git   git init --bare Initialized empty Git repository in  home ams website git    and install the hook on the server      mkdir  var www www example org   cat  gt  hooks post-receive    bin sh GIT WORK TREE  var www www example org git checkout -f GIT WORK TREE  var www www git clean -f -d   clean directory from removed files    chmod  x hooks post-receive   on your client      mkdir website  amp  amp  cd website   git init Initialized empty Git repository in  home ams website  git    echo  Hello  world    gt  index html   git add index html   git commit -q -m  The humble beginnings of my web site      git remote add web ssh   server example org home ams website git   git push web  master refs heads master   then to publish  just type    git push web   There is a full description on the website  http   toroid org ams git-website-howto

User · Answer

I use two solutions for post-receive hook   DEPLOY SOLUTION 1       bin bash      git-repo hooks post-receive - file content on server  chmod as 755 to be executed    DEPLOY SOLUTION 1       export GIT DIR  git repo-bare git     export GIT BRANCH1 master     export GIT TARGET1  var www html     export GIT BRANCH2 dev     export GIT TARGET2  var www dev     echo  GIT DIR    GIT DIR       echo  GIT TARGET1    GIT TARGET1       echo  GIT BRANCH1    GIT BRANCH1       echo  GIT TARGET2    GIT TARGET2       echo  GIT BRANCH2    GIT BRANCH2       echo         cd  GIT DIR   while read oldrev newrev refname do     branch   git rev-parse --abbrev-ref  refname      BRANCH REGEX     GIT BRANCH1          if     branch     BRANCH REGEX      then         export GIT WORK TREE  GIT TARGET1           echo  Checking out branch   branch           echo  Checking out to workdir   GIT WORK TREE             git checkout -f  branch     fi      BRANCH REGEX     GIT BRANCH2          if     branch     BRANCH REGEX      then         export GIT WORK TREE  GIT TARGET2           echo  Checking out branch   branch           echo  Checking out to workdir   GIT WORK TREE             git checkout -f  branch     fi done   DEPLOY SOLUTION 2       bin bash      git-repo hooks post-receive - file content on server  chmod as 755 to be executed    DEPLOY SOLUTION 2      export GIT DIR  git repo-bare git     export GIT BRANCH1 master     export GIT TARGET1  var www html     export GIT BRANCH2 dev     export GIT TARGET2  var www dev     export GIT TEMP DIR1  tmp deploy1     export GIT TEMP DIR2  tmp deploy2     echo  GIT DIR    GIT DIR       echo  GIT TARGET1    GIT TARGET1       echo  GIT BRANCH1    GIT BRANCH1       echo  GIT TARGET2    GIT TARGET2       echo  GIT BRANCH2    GIT BRANCH2       echo  GIT TEMP DIR1    GIT TEMP DIR1       echo  GIT TEMP DIR2    GIT TEMP DIR2       echo         cd  GIT DIR   while read oldrev newrev refname do     branch   git rev-parse --abbrev-ref  refname      BRANCH REGEX     GIT BRANCH1          if     branch     BRANCH REGEX      then         export GIT WORK TREE  GIT TARGET1           echo  Checking out branch   branch           echo  Checking out to workdir   GIT WORK TREE               DEPLOY SOLUTION 2           cd  GIT DIR   mkdir -p  GIT TEMP DIR1           export GIT WORK TREE  GIT TEMP DIR1           git checkout -f  branch         export GIT WORK TREE  GIT TARGET1           rsync  GIT TEMP DIR1   -v -q --delete --delete-after -av  GIT TARGET1           rm -rf  GIT TEMP DIR1     fi      BRANCH REGEX     GIT BRANCH2          if     branch     BRANCH REGEX      then         export GIT WORK TREE  GIT TARGET2           echo  Checking out branch   branch           echo  Checking out to workdir   GIT WORK TREE               DEPLOY SOLUTION 2           cd  GIT DIR   mkdir -p  GIT TEMP DIR2           export GIT WORK TREE  GIT TEMP DIR2           git checkout -f  branch         export GIT WORK TREE  GIT TARGET2           rsync  GIT TEMP DIR2   -v -q --delete --delete-after -av  GIT TARGET2           rm -rf  GIT TEMP DIR2     fi done   Both solutions are based on earlier solutions available in this thread   Note  the  BRANCH REGEX     GIT BRANCH1     filters for the branch names matching  master  or  dev   string  and deploys the work tree  if the pushed branch matches  This makes possible to deploy a dev version and master version to different places   DEPLOY SOLUTION 1 removes only files  which are part of the repo  and was removed by a commit  It is faster than Deployment Solution 2   DEPLOY SOLUTION 2 has the advantage  that it will remove any new files from the production directory  which was added on server side  no matter if it was added to the repo or not  It will be always clean dupe of the repo  It is slower than Deployment Solution 1

User · Answer

You could conceivably set up a git hook that when say a commit is made to say the  stable  branch it will pull the changes and apply them to the PHP site  The big downside is you won t have much control if something goes wrong and it will add time to your testing - but you can get an idea of how much work will be involved when you merge say your trunk branch into the stable branch to know how many conflicts you may run into  It will be important to keep an eye on any files that are site specific  eg  configuration files  unless you solely intend to only run the one site   Alternatively have you looked into pushing the change to the site instead   For information on git hooks see the githooks documentation

User · Answer

My take on Christians solution   git archive --prefix deploy   master   tar -x -C  TMPDIR   rsync  TMPDIR deploy  --copy-links -av username server com  home user my app  amp  amp  rm -rf  TMPDIR deploy    Archives the master branch into tar  Extracts tar archive into deploy dir in system temp folder  rsync changes into server delete deploy dir from temp folder

User · Answer

Given an environment where you have multiple developers accessing the same repository the following guidelines may help   Ensure that you have a unix group that all devs belong to and give ownership of the  git repository to that group    In the  git config of the server repository set sharedrepository   true   This tells git to allow multiple users which is needed for commits and deployment  set the umask of each user in their bashrc files to be the same - 002 is a good start

User · Answer

My take on Christians solution   git archive --prefix deploy   master   tar -x -C  TMPDIR   rsync  TMPDIR deploy  --copy-links -av username server com  home user my app  amp  amp  rm -rf  TMPDIR deploy    Archives the master branch into tar  Extracts tar archive into deploy dir in system temp folder  rsync changes into server delete deploy dir from temp folder

User · Answer

Using the post-update file below    Copy over your  git directory to your web server On your local copy  modify your  git config file and add your web server as a remote    remote  production       url   username webserver  path to htdocs  git  On the server  replace  git hooks post-update with file below Add execute access to the file  again  on the server    chmod  x  git hooks post-update  Now  just locally push to your web server and it should automatically update the working copy   git push production       bin sh     This hook does two things       1  update the  info  files that allow the list of references to be       queries over dumb transports such as http      2  if this repository looks like it is a non-bare repository  and       the checked-out branch is pushed to  then update the working copy        This makes  push  function somewhat similarly to darcs and bzr      To enable this hook  make this file executable by  chmod  x post-update    git-update-server-info  is bare   git-config --get --bool core bare   if   -z   is bare    then         for compatibility s sake  guess       git dir full   cd  GIT DIR  pwd        case  git dir full in    git  is bare false      is bare true   esac fi  update wc           ref  1       echo  Push to checked out branch  ref   gt  amp 2       if     -f  GIT DIR logs HEAD         then              echo  E push to non-bare repository requires a HEAD reflog   gt  amp 2              exit 1       fi       if  cd  GIT WORK TREE  git-diff-files -q --exit-code  gt  dev null        then              wc dirty 0       else              echo  W unstaged changes found in working copy   gt  amp 2              wc dirty 1              desc  working copy        fi       if git diff-index --cached HEAD  1   gt  dev null       then              index dirty 0       else              echo  W uncommitted  staged changes found   gt  amp 2              index dirty 1              if   -n   desc                 then                    desc   desc and index               else                    desc  index               fi       fi       if     wc dirty  -ne 0 -o   index dirty  -ne 0         then              new   git rev-parse HEAD               echo  W stashing dirty  desc - see git-stash 1    gt  amp 2                trap  echo trapped     git symbolic-ref HEAD     ref     2 3 13 15 ERR EXIT              git-update-ref --no-deref HEAD HEAD  1               cd  GIT WORK TREE              git stash save  dirty  desc before update to  new                git-symbolic-ref HEAD   ref                       fi          eye candy - show the WC updates          echo  Updating working copy   gt  amp 2        cd  GIT WORK TREE       git-diff-index -R --name-status HEAD  gt  amp 2       git-reset --hard HEAD     if     is bare     false    then       active branch  git-symbolic-ref HEAD        export GIT DIR   cd  GIT DIR  pwd        GIT WORK TREE   GIT WORK TREE-          for ref       do              if     ref      active branch                 then                    update wc  ref              fi       done fi

User · Answer

You could conceivably set up a git hook that when say a commit is made to say the  stable  branch it will pull the changes and apply them to the PHP site  The big downside is you won t have much control if something goes wrong and it will add time to your testing - but you can get an idea of how much work will be involved when you merge say your trunk branch into the stable branch to know how many conflicts you may run into  It will be important to keep an eye on any files that are site specific  eg  configuration files  unless you solely intend to only run the one site   Alternatively have you looked into pushing the change to the site instead   For information on git hooks see the githooks documentation

User · Answer

I found this script on this site and it seems to work quite well    Copy over your  git directory to your web server On your local copy  modify your  git config file and add your web server as a remote    remote  production       url   username webserver  path to htdocs  git  On the server  replace  git hooks post-update with this file  in the answer below  Add execute access to the file  again  on the server    chmod  x  git hooks post-update  Now  just locally push to your web server and it should automatically update the working copy   git push production

User · Answer

I ended up creating my own rudimentary deployment tool which would automatically pull down new updates from the repo - https   github com jesalg SlimJim - Basically it listens to the github post-receive-hook and uses a proxy to trigger an update script

User · Answer

I use two solutions for post-receive hook   DEPLOY SOLUTION 1       bin bash      git-repo hooks post-receive - file content on server  chmod as 755 to be executed    DEPLOY SOLUTION 1       export GIT DIR  git repo-bare git     export GIT BRANCH1 master     export GIT TARGET1  var www html     export GIT BRANCH2 dev     export GIT TARGET2  var www dev     echo  GIT DIR    GIT DIR       echo  GIT TARGET1    GIT TARGET1       echo  GIT BRANCH1    GIT BRANCH1       echo  GIT TARGET2    GIT TARGET2       echo  GIT BRANCH2    GIT BRANCH2       echo         cd  GIT DIR   while read oldrev newrev refname do     branch   git rev-parse --abbrev-ref  refname      BRANCH REGEX     GIT BRANCH1          if     branch     BRANCH REGEX      then         export GIT WORK TREE  GIT TARGET1           echo  Checking out branch   branch           echo  Checking out to workdir   GIT WORK TREE             git checkout -f  branch     fi      BRANCH REGEX     GIT BRANCH2          if     branch     BRANCH REGEX      then         export GIT WORK TREE  GIT TARGET2           echo  Checking out branch   branch           echo  Checking out to workdir   GIT WORK TREE             git checkout -f  branch     fi done   DEPLOY SOLUTION 2       bin bash      git-repo hooks post-receive - file content on server  chmod as 755 to be executed    DEPLOY SOLUTION 2      export GIT DIR  git repo-bare git     export GIT BRANCH1 master     export GIT TARGET1  var www html     export GIT BRANCH2 dev     export GIT TARGET2  var www dev     export GIT TEMP DIR1  tmp deploy1     export GIT TEMP DIR2  tmp deploy2     echo  GIT DIR    GIT DIR       echo  GIT TARGET1    GIT TARGET1       echo  GIT BRANCH1    GIT BRANCH1       echo  GIT TARGET2    GIT TARGET2       echo  GIT BRANCH2    GIT BRANCH2       echo  GIT TEMP DIR1    GIT TEMP DIR1       echo  GIT TEMP DIR2    GIT TEMP DIR2       echo         cd  GIT DIR   while read oldrev newrev refname do     branch   git rev-parse --abbrev-ref  refname      BRANCH REGEX     GIT BRANCH1          if     branch     BRANCH REGEX      then         export GIT WORK TREE  GIT TARGET1           echo  Checking out branch   branch           echo  Checking out to workdir   GIT WORK TREE               DEPLOY SOLUTION 2           cd  GIT DIR   mkdir -p  GIT TEMP DIR1           export GIT WORK TREE  GIT TEMP DIR1           git checkout -f  branch         export GIT WORK TREE  GIT TARGET1           rsync  GIT TEMP DIR1   -v -q --delete --delete-after -av  GIT TARGET1           rm -rf  GIT TEMP DIR1     fi      BRANCH REGEX     GIT BRANCH2          if     branch     BRANCH REGEX      then         export GIT WORK TREE  GIT TARGET2           echo  Checking out branch   branch           echo  Checking out to workdir   GIT WORK TREE               DEPLOY SOLUTION 2           cd  GIT DIR   mkdir -p  GIT TEMP DIR2           export GIT WORK TREE  GIT TEMP DIR2           git checkout -f  branch         export GIT WORK TREE  GIT TARGET2           rsync  GIT TEMP DIR2   -v -q --delete --delete-after -av  GIT TARGET2           rm -rf  GIT TEMP DIR2     fi done   Both solutions are based on earlier solutions available in this thread   Note  the  BRANCH REGEX     GIT BRANCH1     filters for the branch names matching  master  or  dev   string  and deploys the work tree  if the pushed branch matches  This makes possible to deploy a dev version and master version to different places   DEPLOY SOLUTION 1 removes only files  which are part of the repo  and was removed by a commit  It is faster than Deployment Solution 2   DEPLOY SOLUTION 2 has the advantage  that it will remove any new files from the production directory  which was added on server side  no matter if it was added to the repo or not  It will be always clean dupe of the repo  It is slower than Deployment Solution 1

[git] Deploy a project using Git push

Examples related to git

Examples related to deployment

Examples related to webserver

Examples related to githooks