diff options
| author | sullrich <sullrich@pfsense.org> | 2009-12-03 20:46:43 -0500 |
|---|---|---|
| committer | sullrich <sullrich@pfsense.org> | 2009-12-03 20:46:43 -0500 |
| commit | 672d9ab6b5aff80ad63b240610e26cb5c65cd492 (patch) | |
| tree | fe7dbe794fafa57e87812db2b9df52a3092cee16 /etc/phpshellsessions | |
| parent | ebc93ea128d59485871fe7446190142fa0cf789c (diff) | |
| download | pfsense-672d9ab6b5aff80ad63b240610e26cb5c65cd492.zip pfsense-672d9ab6b5aff80ad63b240610e26cb5c65cd492.tar.gz | |
Use git reset --hard HEAD
Diffstat (limited to 'etc/phpshellsessions')
| -rw-r--r-- | etc/phpshellsessions/gitsync | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/etc/phpshellsessions/gitsync b/etc/phpshellsessions/gitsync index c17b3e8..b500fcb 100644 --- a/etc/phpshellsessions/gitsync +++ b/etc/phpshellsessions/gitsync @@ -122,9 +122,13 @@ if(is_dir("$CODIR/pfSenseGITREPO/pfSenseGITREPO")) { echo "===> Fetching updates...\n"; exec("cd $CODIR/pfSenseGITREPO/pfSenseGITREPO && git fetch"); 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 $branch --hard"); } else { - exec("cd $CODIR/pfSenseGITREPO/pfSenseGITREPO && git reset origin/$branch --hard"); + exec("cd $CODIR/pfSenseGITREPO/pfSenseGITREPO && git reset --hard $branch"); + exec("cd $CODIR/pfSenseGITREPO/pfSenseGITREPO && git rebase origin/$branch"); + exec("cd $CODIR/pfSenseGITREPO/pfSenseGITREPO && git reset origin/$branch"); } } else { exec("mkdir -p $CODIR/pfSenseGITREPO"); |
