diff options
| author | sullrich <sullrich@pfsense.org> | 2009-12-03 20:53:26 -0500 |
|---|---|---|
| committer | sullrich <sullrich@pfsense.org> | 2009-12-03 20:53:26 -0500 |
| commit | 07623d8ee8113a9f3583fbb2f9460954c74d9dd5 (patch) | |
| tree | 0ceed2fabba21c7c9a1fb1807682fcdee0d6316d /etc | |
| parent | 672d9ab6b5aff80ad63b240610e26cb5c65cd492 (diff) | |
| download | pfsense-07623d8ee8113a9f3583fbb2f9460954c74d9dd5.zip pfsense-07623d8ee8113a9f3583fbb2f9460954c74d9dd5.tar.gz | |
Reset to HEAD on non master
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/phpshellsessions/gitsync | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/etc/phpshellsessions/gitsync b/etc/phpshellsessions/gitsync index b500fcb..156545e 100644 --- a/etc/phpshellsessions/gitsync +++ b/etc/phpshellsessions/gitsync @@ -124,11 +124,11 @@ 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 $branch --hard"); - } else { 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 origin/$branch"); + exec("cd $CODIR/pfSenseGITREPO/pfSenseGITREPO && git reset --hard origin/$branch"); } } else { exec("mkdir -p $CODIR/pfSenseGITREPO"); |
