From 48b09198cdee13c644d04a78d54a733370518201 Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Tue, 20 Jan 2009 21:00:12 -0500
Subject: Use fetch and merge on subsequent checkouts

---
 etc/phpshellsessions/cvssync | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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");
 }
-- 
cgit v1.1