Skip to content

Commit

Permalink
Add comment about "git fetch"
Browse files Browse the repository at this point in the history
  • Loading branch information
phansys committed May 18, 2018
1 parent 31d5a67 commit 2f9c502
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions src/Operation/RemoteMergeOperation.php
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,7 @@ private function createSourceBranch()
$this->targetBranch = $this->switchBase;
}

// Execute "git fetch" in order to ensure we have the latest commit from target base
$this->processHelper->runCommand(['git', 'fetch', $this->targetBase]);
$currentBaseHeadCommit = $this->processHelper->runCommand(['git', 'rev-parse', $this->targetBase]);
$lastKnownCommonCommit = $this->processHelper->runCommand(['git', 'merge-base', '--fork-point', $this->targetBase, $sourceBranch]);
Expand Down

0 comments on commit 2f9c502

Please sign in to comment.