Skip to content

Fix branch checkout logic #64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danharrin merged 3 commits into from
Feb 9, 2026
Merged

Fix branch checkout logic #64

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4833b08
Fix branch checkout logic
yoriiis Feb 9, 2026
00e085e
Fix spacing in conditional statements
danharrin Feb 9, 2026
c7265bd
Add execOrDie helper function for command execution
danharrin Feb 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions entrypoint.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,12 @@
note(sprintf('Trying to checkout %s branch', $config->getBranch()));

// if the given branch doesn't exist it returns empty string
$branchSwitchedSuccessfully = execOrDie(sprintf('git checkout %s', $config->getBranch())) !== '';
exec(sprintf('git checkout %s', $config->getBranch()), $output, $exitCode);
$branchSwitchedSuccessfully = ($exitCode === 0);

// if the branch doesn't exist we creat it and push to origin
// if the branch doesn't exist we create it and push to origin
// otherwise we just checkout to the given branch
if (!$branchSwitchedSuccessfully) {
if (! $branchSwitchedSuccessfully) {
note(sprintf('Creating branch "%s" as it doesn\'t exist', $config->getBranch()));

exec_with_output_print(sprintf('git checkout -b %s', $config->getBranch()));
Expand Down Expand Up @@ -165,10 +166,11 @@ function list_directory_files(string $directory): void

/********************* helper functions *********************/

/** @phpstan-ignore-next-line */
function execOrDie(string $command, ?array &$output = []): string|false
{
$result = exec($command, $output, $errorCode);
if (0 === $errorCode) {
if ($errorCode === 0) {
return $result;
}

Expand Down
Loading