diff options
| author | sullrich <sullrich@pfsense.org> | 2009-12-06 15:40:16 -0500 |
|---|---|---|
| committer | sullrich <sullrich@pfsense.org> | 2009-12-06 15:40:16 -0500 |
| commit | 7d736708b75e068ab34de1164adb2761540c5149 (patch) | |
| tree | e30d59d2321d46188531de10e8de46b823526ae7 /etc/phpshellsessions | |
| parent | 64e9ae079303529f767ba99019393421e2fc3b29 (diff) | |
| download | pfsense-7d736708b75e068ab34de1164adb2761540c5149.zip pfsense-7d736708b75e068ab34de1164adb2761540c5149.tar.gz | |
Fix RELENG_1_2 gitsync
Diffstat (limited to 'etc/phpshellsessions')
| -rw-r--r-- | etc/phpshellsessions/gitsync | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/etc/phpshellsessions/gitsync b/etc/phpshellsessions/gitsync index 1458625..4ce8d27 100644 --- a/etc/phpshellsessions/gitsync +++ b/etc/phpshellsessions/gitsync @@ -130,8 +130,12 @@ if(is_dir("$CODIR/pfSenseGITREPO/pfSenseGITREPO")) { run_cmds($git_cmd); } else { $git_cmd = array( - "cd $CODIR/pfSenseGITREPO/pfSenseGITREPO && git reset HEAD --hard", - "cd $CODIR/pfSenseGITREPO/pfSenseGITREPO && git rebase origin/$branch" + "cd $CODIR/pfSenseGITREPO/pfSenseGITREPO && git reset HEAD --hard", + "cd $CODIR/pfSenseGITREPO/pfSenseGITREPO && git checkout master", + "cd $CODIR/pfSenseGITREPO/pfSenseGITREPO && git branch -D $branch", + "cd $CODIR/pfSenseGITREPO/pfSenseGITREPO && git fetch", + "cd $CODIR/pfSenseGITREPO/pfSenseGITREPO && git rebase origin", + "cd $CODIR/pfSenseGITREPO/pfSenseGITREPO && git checkout -b $branch origin/$branch" ); } run_cmds($git_cmd); |
