Fix: not activating environment with push options, after asking interactively

pjcdawkins · pjcdawkins · commit 9610e4801e0d · 2023-12-07T16:43:42.000Z
diff --git a/src/Command/Environment/EnvironmentPushCommand.php b/src/Command/Environment/EnvironmentPushCommand.php
@@ -251,7 +251,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $gitArgs[] = '--progress';
         }
         if ($gitPushOptionsEnabled) {
-            if ($input->getOption('branch') || $input->getOption('activate')) {
+            if ($activateRequested) {
                 $gitArgs[] = '--push-option=environment.status=active';
             }
             if ($parentId !== null) {

Original file line number	Diff line number	Diff line change
`@@ -251,7 +251,7 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`251`	`251`	`$gitArgs[] = '--progress';`
`252`	`252`	`}`
`253`	`253`	`if ($gitPushOptionsEnabled) {`
`254`		`- if ($input->getOption('branch') \|\| $input->getOption('activate')) {`
	`254`	`+ if ($activateRequested) {`
`255`	`255`	`$gitArgs[] = '--push-option=environment.status=active';`
`256`	`256`	`}`
`257`	`257`	`if ($parentId !== null) {`