summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorsullrich <sullrich@pfsense.org>2009-12-04 21:01:16 -0500
committersullrich <sullrich@pfsense.org>2009-12-04 21:06:18 -0500
commit0b904d982f07429a71a65898771b3dabf8402693 (patch)
treea9f71f9498c68e6ed84725bcfa616e74af4b954f /etc
parentb4a9785a9b84c5ecb6f118d268f74e67a50fcd59 (diff)
downloadpfsense-0b904d982f07429a71a65898771b3dabf8402693.zip
pfsense-0b904d982f07429a71a65898771b3dabf8402693.tar.gz
No need for duplicate command
Diffstat (limited to 'etc')
-rw-r--r--etc/phpshellsessions/gitsync2
1 files changed, 0 insertions, 2 deletions
diff --git a/etc/phpshellsessions/gitsync b/etc/phpshellsessions/gitsync
index 156545e..57f785f 100644
--- a/etc/phpshellsessions/gitsync
+++ b/etc/phpshellsessions/gitsync
@@ -124,11 +124,9 @@ if(is_dir("$CODIR/pfSenseGITREPO/pfSenseGITREPO")) {
if($branch == "master") {
exec("cd $CODIR/pfSenseGITREPO/pfSenseGITREPO && git reset --hard HEAD");
exec("cd $CODIR/pfSenseGITREPO/pfSenseGITREPO && git rebase origin");
- exec("cd $CODIR/pfSenseGITREPO/pfSenseGITREPO && git reset --hard $branch");
} else {
exec("cd $CODIR/pfSenseGITREPO/pfSenseGITREPO && git reset --hard HEAD");
exec("cd $CODIR/pfSenseGITREPO/pfSenseGITREPO && git rebase origin/$branch");
- exec("cd $CODIR/pfSenseGITREPO/pfSenseGITREPO && git reset --hard origin/$branch");
}
} else {
exec("mkdir -p $CODIR/pfSenseGITREPO");
OpenPOWER on IntegriCloud