diff options
-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 0a713ff..864826e 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 fetch"); + exec("cd $CODIR/master/mainline && git fetch && git merge"); } else { exec("cd $CODIR && git clone $GIT_REPO"); - exec("cd $CODIR/master/mainline && git checkout -b $BRANCHTAG origin/$BRANCHTAG"); + exec("cd $CODIR/master/mainline && git fetch && git merge && git checkout -b $BRANCHTAG origin/$BRANCHTAG"); } if($branch == "master") |