gtx-cli 2.6.15 → 2.6.16

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # gtx-cli
 
+## 2.6.16
+
+### Patch Changes
+
+- [#1002](https://github.com/generaltranslation/gt/pull/1002) [`8f8368a`](https://github.com/generaltranslation/gt/commit/8f8368a8723f79c4ebe56129bac03cb6cb33eec8) Thanks [@ErnestM1234](https://github.com/ErnestM1234)! - fix: branch detection vercel
+
 ## 2.6.15
 
 ### Patch Changes

package/dist/config/generateSettings.js

@@ -175,8 +175,11 @@ export async function generateSettings(flags, cwd = process.cwd()) {
     ];
     // Add branch options if not provided
     const branchOptions = mergedOptions.branchOptions || {};
+    // If --branch is set, enable branching
     branchOptions.enabled =
-        flags.enableBranching ?? gtConfig.branchOptions?.enabled ?? false;
+        flags.enableBranching ??
+            gtConfig.branchOptions?.enabled ??
+            (flags.branch ? true : false);
     branchOptions.currentBranch =
         flags.branch ?? gtConfig.branchOptions?.currentBranch ?? undefined;
     branchOptions.autoDetectBranches = flags.disableBranchDetection

package/dist/generated/version.d.ts

@@ -1 +1 @@
-export declare const PACKAGE_VERSION = "2.6.15";
+export declare const PACKAGE_VERSION = "2.6.16";

package/dist/generated/version.js

@@ -1,2 +1,2 @@
 // This file is auto-generated. Do not edit manually.
-export const PACKAGE_VERSION = '2.6.15';
+export const PACKAGE_VERSION = '2.6.16';

package/dist/workflow/BranchStep.js

@@ -30,6 +30,7 @@ export class BranchStep extends WorkflowStep {
         let incoming = [];
         let checkedOut = [];
         let useDefaultBranch = true;
+        let autoDetectFailed = false;
         if (this.settings.branchOptions.enabled &&
             this.settings.branchOptions.autoDetectBranches) {
             const [currentResult, incomingResult, checkedOutResult] = await Promise.all([
@@ -40,7 +41,21 @@ export class BranchStep extends WorkflowStep {
             current = currentResult;
             incoming = incomingResult;
             checkedOut = checkedOutResult;
-            useDefaultBranch = false;
+            // Try env var detection if git commands failed (e.g. Vercel)
+            if (!currentResult) {
+                autoDetectFailed = true;
+                const vercelBranch = process.env.VERCEL_GIT_COMMIT_REF;
+                if (vercelBranch) {
+                    current = { currentBranchName: vercelBranch, defaultBranch: false };
+                }
+            }
+            // If detection succeeded, use the detected branch; otherwise fall back to default
+            if (current) {
+                useDefaultBranch = false;
+            }
+            else {
+                logger.warn('Branch auto-detection failed. Falling back to the default branch. Use --branch to specify a branch manually.');
+            }
         }
         if (this.settings.branchOptions.enabled &&
             this.settings.branchOptions.currentBranch) {
@@ -129,6 +144,14 @@ export class BranchStep extends WorkflowStep {
                 }
             })
                 .filter((b) => b !== null)[0] ?? null;
+        // When --branch is set manually or auto-detection failed, assume it was checked out from default
+        if ((this.settings.branchOptions.currentBranch || autoDetectFailed) &&
+            (!this.settings.branchOptions.autoDetectBranches || autoDetectFailed) &&
+            !this.branchData.checkedOutBranch &&
+            branchData.defaultBranch &&
+            this.branchData.currentBranch.id !== branchData.defaultBranch.id) {
+            this.branchData.checkedOutBranch = branchData.defaultBranch;
+        }
         this.spinner.stop(chalk.green('Branch information resolved successfully'));
         return this.branchData;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gtx-cli",
-  "version": "2.6.15",
+  "version": "2.6.16",
   "main": "dist/index.js",
   "bin": "dist/main.js",
   "files": [