diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2009-01-20 16:26:45 -0500 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2009-01-20 16:26:45 -0500 |
| commit | 086f0258c3ede9fd49a3aa1372dc423e451af1c9 (patch) | |
| tree | 63bc3fca6a06bd03caff25805a8de6e045c87996 /etc/phpshellsessions | |
| parent | 7c4dddcbe90caeb0b69433ed273a898459d74f34 (diff) | |
| download | pfsense-086f0258c3ede9fd49a3aa1372dc423e451af1c9.zip pfsense-086f0258c3ede9fd49a3aa1372dc423e451af1c9.tar.gz | |
Use git fetch and merge
Diffstat (limited to 'etc/phpshellsessions')
| -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") |
