From 086f0258c3ede9fd49a3aa1372dc423e451af1c9 Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Tue, 20 Jan 2009 16:26:45 -0500
Subject: Use git fetch and merge

---
 etc/phpshellsessions/cvssync | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'etc/phpshellsessions')

diff --git a/etc/phpshellsessions/cvssync b/etc/phpshellsessions/cvssync
index 0a713ff..864826e 100644
--- a/etc/phpshellsessions/cvssync
+++ b/etc/phpshellsessions/cvssync
@@ -98,10 +98,10 @@ exec("mkdir -p /root/pfsense/$branch");
 
 // Git 'er done!
 if(is_dir("$CODIR/master/mainline")) {
-	exec("cd $CODIR/master/mainline && git fetch");
+	exec("cd $CODIR/master/mainline && git fetch && git merge");
 } else {
 	exec("cd $CODIR && git clone $GIT_REPO");
-	exec("cd $CODIR/master/mainline && git checkout -b $BRANCHTAG origin/$BRANCHTAG");	
+	exec("cd $CODIR/master/mainline && git fetch && git merge && git checkout -b $BRANCHTAG origin/$BRANCHTAG");	
 }
 
 if($branch == "master")
-- 
cgit v1.1