diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2009-01-20 20:57:24 -0500 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2009-01-20 20:57:24 -0500 |
| commit | 4a172b2a193012dfadf5bac9dc631cb8a2adccf3 (patch) | |
| tree | 0b3c91368b634f93b4dc2acf33764f59c5d85bb0 /etc | |
| parent | ec1cd1cf79961bdc0d6f4c3e36b760f017ee1364 (diff) | |
| download | pfsense-4a172b2a193012dfadf5bac9dc631cb8a2adccf3.zip pfsense-4a172b2a193012dfadf5bac9dc631cb8a2adccf3.tar.gz | |
Use fetch and merge on subsequent checkouts
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/phpshellsessions/cvssync | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/etc/phpshellsessions/cvssync b/etc/phpshellsessions/cvssync index 8617a5e..e56d8fb 100644 --- a/etc/phpshellsessions/cvssync +++ b/etc/phpshellsessions/cvssync @@ -102,6 +102,7 @@ exec("mkdir -p /root/pfsense/$branch"); // Git 'er done! if(is_dir("$CODIR/pfSenseGITREPO")) { exec("cd $CODIR/pfSenseGITREPO && git fetch"); + exec("cd $CODIR/pfSenseGITREPO && git merge $BRANCHTAG"); } else { exec("cd $CODIR && git clone $GIT_REPO pfSenseGITREPO"); } @@ -110,10 +111,11 @@ if($branch == "master") { exec("cd $CODIR/pfSenseGITREPO && git checkout master"); } else { $current_branch=`git branch | grep $BRANCHTAG`; - if($current_branch == "") - exec("cd $CODIR/pfSenseGITREPO && git fetch && git checkout -b $BRANCHTAG origin/$BRANCHTAG"); - else + if($current_branch == "") { + exec("cd $CODIR/pfSenseGITREPO && git checkout -b $BRANCHTAG origin/$BRANCHTAG"); + } else { exec("cd $CODIR/pfSenseGITREPO && git checkout $BRANCHTAG"); + } } exec("mkdir -p /tmp/lighttpd/cache/compress/"); |
