[FEATURE] RS-1988 aoe/tagging library checkout-Prozess anpassen

AOEpeople · Jul 19, 2016 · 94ac03e · 94ac03e
1 parent 5882f86
commit 94ac03e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/Vcs/Driver/GitDriver.php b/src/Vcs/Driver/GitDriver.php
@@ -112,7 +112,7 @@ public function hasChangesSinceTag($tag, $branch, $path, OutputInterface $output
     {
         try {
             $this->getGit()->getAdapter()->execute('fetch', ['origin'], $path);
-            $this->getGit()->getAdapter()->execute('branch', [$branch ,'origin/' . $branch, '-fq'], $path);
+            $this->getGit()->getAdapter()->execute('branch', [$branch ,'origin/' . $branch, '-f'], $path);
             $diff = $this->getGit()->getAdapter()->execute('diff', array('--ignore-all-space', $tag), $path);
         } catch (\RuntimeException $e) {
             if (false !== strpos($e->getMessage(), 'unknown revision or path')) {

diff --git a/test/Vcs/Driver/GitDriverTest.php b/test/Vcs/Driver/GitDriverTest.php
@@ -188,7 +188,7 @@ public function shouldNotHaveChangesSinceTagWithNullValueFromGitAdapter()
 
         $adapter->expects($this->at(1))->method('execute')->with(
             'branch',
-            array('master', 'origin/master', '-fq'),
+            array('master', 'origin/master', '-f'),
             '/home/my/vcs/repo'
         );
 
@@ -232,7 +232,7 @@ public function shouldNotHaveChangesSinceTagWithEmptyStringValueFromGitAdapter()
 
         $adapter->expects($this->at(1))->method('execute')->with(
             'branch',
-            array('master', 'origin/master', '-fq'),
+            array('master', 'origin/master', '-f'),
             '/home/my/vcs/repo'
         );
 
@@ -277,7 +277,7 @@ public function shouldHaveChangesSinceTag()
 
         $adapter->expects($this->at(1))->method('execute')->with(
             'branch',
-            array('master', 'origin/master', '-fq'),
+            array('master', 'origin/master', '-f'),
             '/home/my/vcs/repo'
         );
 
@@ -329,7 +329,7 @@ public function shouldHaveChangesSinceTagOnUnknownTag()
 
         $adapter->expects($this->at(1))->method('execute')->with(
             'branch',
-            array('master', 'origin/master', '-fq'),
+            array('master', 'origin/master', '-f'),
             '/home/my/vcs/repo'
         );