diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2009-01-20 16:14:12 -0500 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2009-01-20 16:14:12 -0500 |
| commit | 2d0bde4cbc2bc5934b2d7e53f08c94ec74a43f03 (patch) | |
| tree | 98be9b7bb8c60e9c3d5d4db9cc83a64da1df1e51 /etc/phpshellsessions | |
| parent | aa89be9d562da1b69898e3167ca81b4cb7d67f21 (diff) | |
| download | pfsense-2d0bde4cbc2bc5934b2d7e53f08c94ec74a43f03.zip pfsense-2d0bde4cbc2bc5934b2d7e53f08c94ec74a43f03.tar.gz | |
Correctly checkout GIT
Diffstat (limited to 'etc/phpshellsessions')
| -rw-r--r-- | etc/phpshellsessions/cvssync | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/etc/phpshellsessions/cvssync b/etc/phpshellsessions/cvssync index f5c8a40..ff1e6e2 100644 --- a/etc/phpshellsessions/cvssync +++ b/etc/phpshellsessions/cvssync @@ -97,15 +97,17 @@ echo "===> Checking out $branch\n"; exec("mkdir -p /root/pfsense/$branch"); // Git 'er done! -if(is_dir("$CODIR/master/mainline")) - exec("cd $CODIR/master/mainline && git fetch"); -else +if(is_dir("$CODIR/master/mainline")) { + exec("cd $CODIR/master/mainline && git pull"); +} else { exec("cd $CODIR && git clone $GIT_REPO"); + exec("cd $CODIR/master/mainline && git pull && checkout -b $BRANCHTAG origin/$BRANCHTAG"); +} if($branch == "master") exec("cd $CODIR/master/mainline && git pull && git checkout master"); else - exec("cd $CODIR/master/mainline && git pull && checkout -b $BRANCHTAG origin/$BRANCHTAG"); + exec("cd $CODIR/master/mainline && git pull && checkout $BRANCHTAG"); exec("mkdir -p /tmp/lighttpd/cache/compress/"); |
