diff options
author | sullrich <sullrich@pfsense.org> | 2009-12-03 19:16:36 -0500 |
---|---|---|
committer | sullrich <sullrich@pfsense.org> | 2009-12-03 19:16:36 -0500 |
commit | 00a30067ddb8faa5a1a654385983c93a7c0b6097 (patch) | |
tree | 953f8b010d848fe1cd22b9b0051ede8f00008f45 | |
parent | e2dc428920337c40a2a0aa2f978a424e86caf239 (diff) | |
download | pfsense-00a30067ddb8faa5a1a654385983c93a7c0b6097.zip pfsense-00a30067ddb8faa5a1a654385983c93a7c0b6097.tar.gz |
Uncomment code and move to checkout tree after intiial fetch
-rw-r--r-- | etc/phpshellsessions/gitsync | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/etc/phpshellsessions/gitsync b/etc/phpshellsessions/gitsync index 4f75462..c17b3e8 100644 --- a/etc/phpshellsessions/gitsync +++ b/etc/phpshellsessions/gitsync @@ -134,16 +134,13 @@ if(is_dir("$CODIR/pfSenseGITREPO/pfSenseGITREPO")) { exec("mv $CODIR/pfSenseGITREPO/pfSense $CODIR/pfSenseGITREPO/pfSenseGITREPO"); if(is_dir("$CODIR/pfSenseGITREPO/mainline")) exec("mv $CODIR/pfSenseGITREPO/mainline $CODIR/pfSenseGITREPO/pfSenseGITREPO"); + if($branch == "master") { + exec("cd $CODIR/pfSenseGITREPO/pfSenseGITREPO && git checkout master"); + } else { + exec("cd $CODIR/pfSenseGITREPO/pfSenseGITREPO && git checkout -b $branch origin/$branch"); + } } -/* -if($branch == "master") { - exec("cd $CODIR/pfSenseGITREPO/pfSenseGITREPO && git checkout master"); -} else { - exec("cd $CODIR/pfSenseGITREPO/pfSenseGITREPO && git checkout -b $branch origin/$branch"); -} -*/ - exec("mkdir -p /tmp/lighttpd/cache/compress/"); // Nuke CVS and pfSense tarballs |