Geek asks and answers

How to set up git development environment with remote testing

This may seem like a silly question, but I feel like I understand GIT well, but still I can’t set up my development environment as I would like. I either missed something really simple, or I'm wrong :)

I initialized the bare GIT repository on my server, cloned it to my local computer, transferred my files and clicked on the source. Then locally I created three branches (master, release, development) and published them all by origin. I intend to pull several developers out of the development branch, and I would like to make sure that they cannot click on the main branch, but this might be better for another question.

Now I make my changes to the files locally, and then upload them to the test server and check the test server through a web browser. I would have to assume that so most people check their work if they do not have computers configured as web servers and php and mysql are installed. Once I'm happy with my changes, I push them to the original repo and everything works fine.

My task is that the test server is synchronized with my local machine. I tried setting up the repo in my remote test directory, and I added a second remote to my local GIT repository, hoping I could click on the test repo to sync the files on the test server with my local files, But I can’t figure out how to have two remote control and keep them both in sync with my local machine.

If I create a new local branch, check it to start working on a new function, and then click on the branch on my test panel, the head on the test panel is still the master, and not my new function branch. Therefore, I make changes locally in the function branch, but when I publish changes to the test server through the code, I actually change the files on the main branch of the test repo. If I cannot synchronize my testing snapshots with my local snapshots, I don’t know how to take full advantage of the gits branching capabilities.

, ? GIT, ? ? checkout , , . , !

+3
1

. . . , git , , dev env.

, - . post-receive . .

:

  • . "" .
  • -, .
  • post-receive , - .

script:

#!/bin/sh
while read oldrev newrev refname
do
    upgrade_sh=./upgrade.sh
    if test -e $upgrade_sh; then
        upgrade_sh=$(readlink $upgrade_sh || echo $upgrade_sh)
        echo calling upgrade script: $upgrade_sh
        $upgrade_sh $refname
    else
        echo NOT calling non-existent upgrade script: $upgrade_sh
    fi
done

.git/hooks .

upgrade.sh script hooks. upgrade.sh script reset , :

#!/bin/sh -e
unset GIT_DIR
git checkout -f $1

, , , Django Apache.

, .

+3

More articles:


All Articles