Merge pull request #19 from niels-nijens/fix-pull-existing-branch

Add git pull to GitAdapter::checkout to make sure the checking out the current branch pulls the updates
accompli · Mar 25, 2016 · a6b759d · a6b759d
2 parents 7bfd10b + 29408a6
commit a6b759d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning 2](http://semver.org/).
 
 ## [Unreleased]
+### Fixed
+* Fixed updating the current branch of a git clone with the checkout command.
 
 ## [0.2.0] - 2016-03-31
 ### Added

diff --git a/src/Adapter/GitAdapter.php b/src/Adapter/GitAdapter.php
@@ -82,7 +82,7 @@ public function checkout($version)
 
         $escapedVersion = ProcessUtils::escapeArgument($version);
         if ($this->processExecutor->isDirectory($this->repositoryDirectory) && $this->processExecutor->execute('git rev-parse --is-inside-work-tree', $this->repositoryDirectory)->isSuccessful()) {
-            $checkoutSuccesful = ($this->processExecutor->execute('git fetch', $this->repositoryDirectory)->isSuccessful() && $this->processExecutor->execute(sprintf('git checkout %s', $escapedVersion), $this->repositoryDirectory)->isSuccessful());
+            $checkoutSuccesful = ($this->processExecutor->execute('git fetch', $this->repositoryDirectory)->isSuccessful() && $this->processExecutor->execute(sprintf('git checkout %s', $escapedVersion), $this->repositoryDirectory)->isSuccessful() && $this->processExecutor->execute('git pull', $this->repositoryDirectory)->isSuccessful());
         } else {
             $escapedRepositoryUrl = ProcessUtils::escapeArgument($this->repositoryUrl);
             $escapedRepositoryDirectory = ProcessUtils::escapeArgument($this->repositoryDirectory);

diff --git a/tests/Adapter/GitAdapterTest.php b/tests/Adapter/GitAdapterTest.php
@@ -245,14 +245,16 @@ public function provideTestCheckout()
         $processExecutorMock->expects($this->once())
                 ->method('isDirectory')
                 ->willReturn(true);
-        $processExecutorMock->expects($this->exactly(3))
+        $processExecutorMock->expects($this->exactly(4))
                 ->method('execute')
                 ->withConsecutive(
                         array($this->equalTo('git rev-parse --is-inside-work-tree'), $this->equalTo('/git/working-directory')),
                         array($this->equalTo('git fetch')),
-                        array($this->equalTo($checkoutCommand), $this->equalTo('/git/working-directory'))
+                        array($this->equalTo($checkoutCommand), $this->equalTo('/git/working-directory')),
+                        array($this->equalTo('git pull'), $this->equalTo('/git/working-directory'))
                 )
                 ->willReturnOnConsecutiveCalls(
+                        new ProcessExecutionResult(0, '', ''),
                         new ProcessExecutionResult(0, '', ''),
                         new ProcessExecutionResult(0, '', ''),
                         new ProcessExecutionResult(0, '', '')