Merge pull request #2142 from hmacr/1we7-production-branch-for-github

Default to `providerBranch` for manual VCS re-deployment

Author: Meldiron

src/routes/(console)/project-[region]-[project]/functions/function-[function]/(modals)/createGit.svelte

@@ -51,7 +51,10 @@
                 .vcs.listRepositoryBranches($installation.$id, selectedRepository);
 
             const sorted = sortBranches(branchList.branches);
-            branch = sorted[0]?.name ?? null;
+
+            branch = sorted.find((b) => b.name === $func.providerBranch)
+                ? $func.providerBranch
+                : (sorted[0]?.name ?? null);
 
             if (!branch) {
                 branch = 'main';

src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/createGitDeploymentModal.svelte

@@ -57,7 +57,10 @@
                 .vcs.listRepositoryBranches($installation.$id, selectedRepository);
 
             const sorted = sortBranches(branchList.branches);
-            branch = sorted[0]?.name ?? null;
+
+            branch = sorted.find((b) => b.name === site.providerBranch)
+                ? site.providerBranch
+                : (sorted[0]?.name ?? null);
 
             if (!branch) {
                 branch = 'main';