diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2009-01-20 16:25:06 -0500 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2009-01-20 16:25:06 -0500 |
| commit | bd0aa12c1f349b5094a26f762f229295726c4c0b (patch) | |
| tree | 9a85b059af1f414f0d7d6347be9ce1e8f15b813c /etc/phpshellsessions | |
| parent | 2d0bde4cbc2bc5934b2d7e53f08c94ec74a43f03 (diff) | |
| download | pfsense-bd0aa12c1f349b5094a26f762f229295726c4c0b.zip pfsense-bd0aa12c1f349b5094a26f762f229295726c4c0b.tar.gz | |
use git fetch and merge
Diffstat (limited to 'etc/phpshellsessions')
| -rw-r--r-- | etc/phpshellsessions/cvssync | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/phpshellsessions/cvssync b/etc/phpshellsessions/cvssync index ff1e6e2..0a012d8 100644 --- a/etc/phpshellsessions/cvssync +++ b/etc/phpshellsessions/cvssync @@ -98,10 +98,10 @@ exec("mkdir -p /root/pfsense/$branch"); // Git 'er done! if(is_dir("$CODIR/master/mainline")) { - exec("cd $CODIR/master/mainline && git pull"); + exec("cd $CODIR/master/mainline && git fetch"); } else { exec("cd $CODIR && git clone $GIT_REPO"); - exec("cd $CODIR/master/mainline && git pull && checkout -b $BRANCHTAG origin/$BRANCHTAG"); + exec("cd $CODIR/master/mainline && git fetch && git merge && checkout -b $BRANCHTAG origin/$BRANCHTAG"); } if($branch == "master") |
