From a3e4524d2f2f24be400bb4663da2caa99d87b3ae Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Fri, 13 Mar 2009 00:12:23 -0400
Subject: [PATCH] Handle 1.2 correctly

---
 etc/phpshellsessions/cvssync | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/etc/phpshellsessions/cvssync b/etc/phpshellsessions/cvssync
index 461811fd34..5edbc9fe4d 100644
--- a/etc/phpshellsessions/cvssync
+++ b/etc/phpshellsessions/cvssync
@@ -124,12 +124,7 @@ if(is_dir("$CODIR/pfSenseGITREPO")) {
 if($branch == "master") {
 	exec("cd $CODIR/pfSenseGITREPO/pfSenseGITREPO && git checkout master");
 } else {
-	$current_branch=`git branch | grep $branch`;
-	if($current_branch == "") {
-		exec("cd $CODIR/pfSenseGITREPO/pfSenseGITREPO && git checkout -b $branch origin/$branch");
-	} else {
-		exec("cd $CODIR/pfSenseGITREPO/pfSenseGITREPO && git checkout $branch");
-	}
+	exec("cd $CODIR/pfSenseGITREPO/pfSenseGITREPO && git checkout -b $branch origin/$branch");
 }
 
 exec("mkdir -p /tmp/lighttpd/cache/compress/");