diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2009-01-20 21:00:12 -0500 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2009-01-20 21:00:12 -0500 |
| commit | 48b09198cdee13c644d04a78d54a733370518201 (patch) | |
| tree | aac6d9c2dab1b0f05c097e9b996f5e08a3ac4154 /etc/phpshellsessions | |
| parent | ad942134c5849686a385da458ea4f5d7a3752000 (diff) | |
| download | pfsense-48b09198cdee13c644d04a78d54a733370518201.zip pfsense-48b09198cdee13c644d04a78d54a733370518201.tar.gz | |
Use fetch and merge on subsequent checkouts
Diffstat (limited to 'etc/phpshellsessions')
| -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"); } |
