Update RemoteMergeOperation::createSourceBranch()

gushphp · May 18, 2018 · 6a1d22e · 6a1d22e
1 parent ca8033b
commit 6a1d22e
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/Operation/RemoteMergeOperation.php b/src/Operation/RemoteMergeOperation.php
@@ -191,10 +191,6 @@ private function createSourceBranch()
             $this->targetBranch = $this->switchBase;
         }
 
-        if ($this->squash) {
-            $this->gitHelper->squashCommits($this->targetBase, $sourceBranch, $this->forceSquash, $this->guardSync);
-        }
-
         $currentBaseHeadCommit = $this->processHelper->runCommand(['git', 'rev-parse', $this->targetBase]);
         $lastKnownCommonCommit = $this->processHelper->runCommand(['git', 'merge-base', '--fork-point', $this->targetBase, $sourceBranch]);
 
@@ -213,6 +209,10 @@ private function createSourceBranch()
             }
         }
 
+        if ($this->squash) {
+            $this->gitHelper->squashCommits($this->targetBase, $sourceBranch, $this->forceSquash);
+        }
+
         // Allow a callback to allow late commits list composition
         if ($this->message instanceof \Closure) {
             $closure = $this->message;