mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use fetch and merge on subsequent checkouts

Browse Source
This commit is contained in:
Scott Ullrich 2009-01-20 20:57:11 -05:00
parent 2ac39ce3d7
commit ad942134c5
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
etc/phpshellsessions/cvssync
View File

@ -102,6 +102,7 @@ exec("mkdir -p /root/pfsense/$branch");
// Git 'er done!
if(is_dir("$CODIR/pfSenseGITREPO")) {
exec("cd $CODIR/pfSenseGITREPO && git fetch");
exec("cd $CODIR/pfSenseGITREPO && git merge $BRANCHTAG");
} else {
exec("cd $CODIR && git clone $GIT_REPO pfSenseGITREPO");
}
@ -110,10 +111,11 @@ if($branch == "master") {
exec("cd $CODIR/pfSenseGITREPO && git checkout master");
} else {
$current_branch=`git branch | grep $BRANCHTAG`;
if($current_branch == "")
exec("cd $CODIR/pfSenseGITREPO && git fetch && git checkout -b $BRANCHTAG origin/$BRANCHTAG");
else
if($current_branch == "") {
exec("cd $CODIR/pfSenseGITREPO && git checkout -b $BRANCHTAG origin/$BRANCHTAG");
} else {
exec("cd $CODIR/pfSenseGITREPO && git checkout $BRANCHTAG");
}
}
exec("mkdir -p /tmp/lighttpd/cache/compress/");