Update PullRequestMergeCommand::execute()

gushphp · Mar 4, 2017 · 341830d · 341830d
1 parent a6bdd79
commit 341830d
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/Command/PullRequest/PullRequestMergeCommand.php b/src/Command/PullRequest/PullRequestMergeCommand.php
@@ -217,7 +217,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
             // Post merge options
             if ($pr['user'] === $authenticatedUser) {
-                if (!$input->getOption('no-remove-source-branch') && 'yes' === $this->getHelper('gush_style')->choice('Delete source branch?', ['yes', 'no'], 'no')) {
+                if ($removeSourceBranch || (!$input->getOption('no-remove-source-branch') && 'yes' === $this->getHelper('gush_style')->choice('Delete source branch?', ['yes', 'no'], 'no'))) {
                     $adapter->removePullRequestSourceBranch($pr['number']);
                     $styleHelper->note(sprintf('Remote source branch %s:%s has been removed.', $sourceRemote, $sourceBranch));
                 }