diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2009-01-18 15:43:40 -0500 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2009-01-18 15:43:40 -0500 |
| commit | 974dcf8d18fe87d562078abe93a2d907e6a7ba82 (patch) | |
| tree | 80abd567fd36f550e63914adc6364e24dea22561 /etc | |
| parent | 183c16d663d4dbab7834f8af8e23eb5b086c3e85 (diff) | |
| download | pfsense-974dcf8d18fe87d562078abe93a2d907e6a7ba82.zip pfsense-974dcf8d18fe87d562078abe93a2d907e6a7ba82.tar.gz | |
Handle git branches correctly (missing half the command)
Diffstat (limited to 'etc')
| -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/"); |
