Add special handling for master

johannes · Apr 4, 2012 · d4e3751 · d4e3751
1 parent 88a7515
commit d4e3751
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/create-php-workdir b/create-php-workdir
@@ -15,6 +15,7 @@ MASTER_DIR=`pwd`/php-src
 GIT_NEW_WORKDIR=git-new-workdir
 DEFAULT_OPTIONS="--with-mysql=mysqlnd --with-mysqli=mysqlnd --with-pdo-mysql=mysqlnd --with-gd --with-zlib --with-openssl --enable-soap"
 BRANCH=$1
+GIT_BRANCH="PHP-$BRANCH"
 
 git_dir=$(cd "$MASTER_DIR" 2>/dev/null &&
 	git rev-parse --git-dir 2>/dev/null &&
@@ -28,7 +29,15 @@ then
 	exit 127
 fi
 
-$GIT_NEW_WORKDIR $MASTER_DIR ./php-$BRANCH PHP-$BRANCH
+
+if test $BRANCH == master
+then
+	GIT_BRANCH=master
+fi
+
+echo "Checking out $GIT_BRANCH into php-$BRANCH"
+
+$GIT_NEW_WORKDIR $MASTER_DIR ./php-$BRANCH $GIT_BRANCH
 (cd ./php-$BRANCH; ./buildconf)
 mkdir build/$BRANCH