diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2009-01-18 15:38:27 -0500 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2009-01-18 15:38:27 -0500 |
| commit | 4c1ed4a7dc061f61288c4aea914ada55e772f37d (patch) | |
| tree | 67d530d4e014dff6817572f28230b4d856dfec83 | |
| parent | a7592ba0555e2b5f802fa049c846ae3c75491618 (diff) | |
| download | pfsense-4c1ed4a7dc061f61288c4aea914ada55e772f37d.zip pfsense-4c1ed4a7dc061f61288c4aea914ada55e772f37d.tar.gz | |
Handle git branches correctly (missing half the command)
| -rw-r--r-- | etc/phpshellsessions/cvssync | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/etc/phpshellsessions/cvssync b/etc/phpshellsessions/cvssync index 9956e00..24752db 100644 --- a/etc/phpshellsessions/cvssync +++ b/etc/phpshellsessions/cvssync @@ -101,7 +101,11 @@ if(is_dir("$CODIR/master/mainline")) exec("cd $CODIR/master/mainline && git fetch"); else exec("cd $CODIR && git clone $GIT_REPO pfSense"); -exec("cd $CODIR/master/mainline && git checkout $BRANCHTAG"); + +if($branch == "master") + exec("cd $CODIR/master/mainline && git checkout"); +else + exec("cd $CODIR/master/mainline && git checkout -b $BRANCHTAG origin/$BRANCHTAG"); exec("mkdir -p /tmp/lighttpd/cache/compress/"); |
