diff options
| -rw-r--r-- | etc/phpshellsessions/cvssync | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/phpshellsessions/cvssync b/etc/phpshellsessions/cvssync index e56d8fb..8f36a45 100644 --- a/etc/phpshellsessions/cvssync +++ b/etc/phpshellsessions/cvssync @@ -102,7 +102,7 @@ exec("mkdir -p /root/pfsense/$branch"); // Git 'er done! if(is_dir("$CODIR/pfSenseGITREPO")) { exec("cd $CODIR/pfSenseGITREPO && git fetch"); - exec("cd $CODIR/pfSenseGITREPO && git merge $BRANCHTAG"); + exec("cd $CODIR/pfSenseGITREPO && git merge $branch"); } else { exec("cd $CODIR && git clone $GIT_REPO pfSenseGITREPO"); } |
