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:59:48 -05:00
parent 4a172b2a19
commit e3089bf0d8
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etc/phpshellsessions/cvssync
View File

@ -102,7 +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");
exec("cd $CODIR/pfSenseGITREPO && git merge $branch");
} else {
exec("cd $CODIR && git clone $GIT_REPO pfSenseGITREPO");
}