From 6b1437ca75e5fbb3d28f6121ae4153471b91fd86 Mon Sep 17 00:00:00 2001 From: Scott Ullrich Date: Tue, 20 Jan 2009 16:59:38 -0500 Subject: Correctly checkout branches --- etc/phpshellsessions/cvssync | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'etc/phpshellsessions') diff --git a/etc/phpshellsessions/cvssync b/etc/phpshellsessions/cvssync index ca3dc24..f89ae3a 100644 --- a/etc/phpshellsessions/cvssync +++ b/etc/phpshellsessions/cvssync @@ -101,13 +101,18 @@ if(is_dir("$CODIR/mainline")) { exec("cd $CODIR/mainline && git fetch"); } else { exec("cd $CODIR && git clone $GIT_REPO"); - exec("cd $CODIR/mainline && git fetch && git checkout -b $BRANCHTAG origin/$BRANCHTAG"); + exec("cd $CODIR/mainline && git fetch"); } -if($branch == "master") +if($branch == "master") { exec("cd $CODIR/mainline && git checkout master"); -else - exec("cd $CODIR/mainline && git checkout $BRANCHTAG"); +} else { + $current_branch=`git branch | grep $BRANCHTAG` + if($current_branch == "") + exec("cd $CODIR/mainline && git fetch && git checkout -b $BRANCHTAG origin/$BRANCHTAG"); + else + exec("cd $CODIR/mainline && git checkout $BRANCHTAG"); +} exec("mkdir -p /tmp/lighttpd/cache/compress/"); -- cgit v1.1