From 7d306b22954320649e1806c39a73da27157157d3 Mon Sep 17 00:00:00 2001 From: Stian Liknes Date: Tue, 12 Nov 2013 22:18:09 +0100 Subject: [PATCH] Load configuration and create build directory for bare repositories --- PHPCI/Model/Build/LocalBuild.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PHPCI/Model/Build/LocalBuild.php b/PHPCI/Model/Build/LocalBuild.php index bfb8ac9e..08d997dd 100644 --- a/PHPCI/Model/Build/LocalBuild.php +++ b/PHPCI/Model/Build/LocalBuild.php @@ -33,7 +33,7 @@ class LocalBuild extends Build // If there's a /config file in the reference directory, it is probably a bare repository // which we'll extract into our build path directly. if (is_file($reference.'/config') && $this->handleBareRepository($builder, $reference, $buildPath) === true) { - return true; + return $this->handleConfig($builder, $buildPath) !== false; } $buildSettings = $this->handleConfig($builder, $reference); @@ -57,7 +57,7 @@ class LocalBuild extends Build // If it is indeed a bare repository, then extract it into our build path: if ($gitConfig['core']['bare']) { - $builder->executeCommand('git --git-dir="%s" archive master | tar -x -C "%s"', $reference, $buildPath); + $builder->executeCommand('mkdir %2$s; git --git-dir="%1$s" archive master | tar -x -C "%2$s"', $reference, $buildPath); return true; }