gtx-cli 2.6.19 → 2.6.20

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # gtx-cli
 
+## 2.6.20
+
+### Patch Changes
+
+- [#1019](https://github.com/generaltranslation/gt/pull/1019) [`4dd02f0`](https://github.com/generaltranslation/gt/commit/4dd02f00309bfdbc8a2d49c1d4986ead1f28ac8b) Thanks [@ErnestM1234](https://github.com/ErnestM1234)! - fix: default branch fallback
+
 ## 2.6.19
 
 ### Patch Changes

package/dist/generated/version.d.ts

@@ -1 +1 @@
-export declare const PACKAGE_VERSION = "2.6.19";
+export declare const PACKAGE_VERSION = "2.6.20";

package/dist/generated/version.js

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

package/dist/workflow/BranchStep.js

@@ -30,7 +30,7 @@ export class BranchStep extends WorkflowStep {
         let incoming = [];
         let checkedOut = [];
         let useDefaultBranch = true;
-        let autoDetectFailed = false;
+        let autoDetectFailed = !this.settings.branchOptions.autoDetectBranches;
         if (this.settings.branchOptions.enabled &&
             this.settings.branchOptions.autoDetectBranches) {
             const [currentResult, incomingResult, checkedOutResult] = await Promise.all([
@@ -53,9 +53,6 @@ export class BranchStep extends WorkflowStep {
             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) {
@@ -73,6 +70,9 @@ export class BranchStep extends WorkflowStep {
             ],
         });
         if (useDefaultBranch) {
+            if (autoDetectFailed) {
+                logger.warn('Branch auto-detection failed. Falling back to the default branch. Use --branch to specify a branch manually.');
+            }
             if (!branchData.defaultBranch) {
                 const createBranchResult = await this.gt.createBranch({
                     branchName: 'main', // name doesn't matter for default branch
@@ -144,12 +144,8 @@ 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) {
+        // ALWAYS fallback to default branch for checked out branch (to avoid retranslation)
+        if (!this.branchData.checkedOutBranch && branchData.defaultBranch) {
             this.branchData.checkedOutBranch = branchData.defaultBranch;
         }
         this.spinner.stop(chalk.green('Branch information resolved successfully'));

package/package.json

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