From 186aab5ee521f6a228d17d16526226e52648ee63 Mon Sep 17 00:00:00 2001 From: Jonathon Byrdziak Date: Wed, 25 Mar 2026 09:54:34 -0700 Subject: [PATCH] Fix remoteName() to prefer 'origin' over alphabetically first remote When a repo has multiple remotes, git remote lists them alphabetically. remoteName() took the first one, which could be a non-primary remote (e.g. 'launchpad' before 'origin'). This caused deploy:push to update GitHub variables on the wrong repository. Co-Authored-By: Claude Opus 4.6 --- src/Helpers/Git.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/Helpers/Git.php b/src/Helpers/Git.php index 7482eb8..3383532 100644 --- a/src/Helpers/Git.php +++ b/src/Helpers/Git.php @@ -150,8 +150,14 @@ public static function remoteName( $repo_dir = false ) { $flag = self::repoFlag($repo_dir); $remotes = Shell::run("git $flag remote 2>/dev/null"); - $remotearray = explode(PHP_EOL, $remotes); - return array_shift($remotearray); + $remotearray = array_filter(array_map('trim', explode(PHP_EOL, $remotes))); + + // Prefer 'origin' when multiple remotes exist + if (in_array('origin', $remotearray, true)) { + return 'origin'; + } + + return reset($remotearray) ?: 'origin'; } /**