diff options
Diffstat (limited to 'etc/phpshellsessions/gitsync')
-rw-r--r-- | etc/phpshellsessions/gitsync | 2 |
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"); |