diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2009-02-01 00:09:20 -0500 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2009-02-01 00:09:20 -0500 |
| commit | 4e47b62eaa8dc228968fe500b78a5c206ab01c57 (patch) | |
| tree | 883ca9bbbc1f2d3abae31d41909a3c5c7acce01c /etc | |
| parent | 4d6244292395178e089e6eede9271d5c8024afbf (diff) | |
| download | pfsense-4e47b62eaa8dc228968fe500b78a5c206ab01c57.zip pfsense-4e47b62eaa8dc228968fe500b78a5c206ab01c57.tar.gz | |
Unbreal RELENG_1_2 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 aaf7983..7570c08 100644 --- a/etc/phpshellsessions/cvssync +++ b/etc/phpshellsessions/cvssync @@ -112,6 +112,8 @@ if(is_dir("$CODIR/pfSenseGITREPO")) { exec("cd $CODIR/pfSenseGITREPO && git fetch"); exec("cd $CODIR/pfSenseGITREPO && git merge $branch"); } else { + exec("mkdir -p $CODIR/pfSenseGITREPO"); + echo "Executing cd $CODIR/pfSenseGITREPO && git clone $GIT_REPO pfSenseGITREPO"; exec("cd $CODIR/pfSenseGITREPO && git clone $GIT_REPO pfSenseGITREPO"); if(is_dir("$CODIR/pfSenseGITREPO/pfSense")) exec("mv $CODIR/pfSenseGITREPO/pfSense $CODIR/pfSenseGITREPO/pfSenseGITREPO"); @@ -122,11 +124,11 @@ if(is_dir("$CODIR/pfSenseGITREPO")) { if($branch == "master") { exec("cd $CODIR/pfSenseGITREPO && git checkout master"); } else { - $current_branch=`git branch | grep $BRANCHTAG`; + $current_branch=`git branch | grep $branch`; if($current_branch == "") { - exec("cd $CODIR/pfSenseGITREPO/pfSenseGITREPO && git checkout -b $BRANCHTAG origin/$BRANCHTAG"); + exec("cd $CODIR/pfSenseGITREPO/pfSenseGITREPO && git checkout -b $BRANCHTAG origin/$branch"); } else { - exec("cd $CODIR/pfSenseGITREPO/pfSenseGITREPO && git checkout $BRANCHTAG"); + exec("cd $CODIR/pfSenseGITREPO/pfSenseGITREPO && git checkout $branch"); } } |
