Prevent live thread branches from regressing to temp worktree names (#1995)

Julius Marminge committed 7 months ago

Commit f7535bb1 parent cea78b13 files · +19 −1Browse files

Unified · Split

3 files

@@ -1020,6 +1020,15 @@ describe("resolveLiveThreadBranchUpdate", () => { · 1019 unmodified lines
1020		1020
1021	assert.equal(update, null);	1021	assert.equal(update, null);
1022	});	1022	});
		1023
		1024	it("does not regress a semantic thread branch back to a temporary worktree branch", () => {
		1025	const update = resolveLiveThreadBranchUpdate({
		1026	threadBranch: "t3code/github-query-rate-limit",
		1027	gitStatus: status({ branch: "t3code/bda76797" }),
		1028	});
		1029
		1030	assert.equal(update, null);
		1031	});
1023	});	1032	});
1024		1033
1025	describe("resolveAutoFeatureBranchName", () => {	1034	describe("resolveAutoFeatureBranchName", () => {

@@ -12,5 +12,4 @@ export { · 11 unmodified lines
12	resolveQuickAction,	12	resolveQuickAction,
13	resolveThreadBranchUpdate,	13	resolveThreadBranchUpdate,
14	} from "@t3tools/client-runtime";	14	} from "@t3tools/client-runtime";
15
16	export { resolveAutoFeatureBranchName } from "@t3tools/shared/git";	15	export { resolveAutoFeatureBranchName } from "@t3tools/shared/git";

   GitStackedAction,
   GitStatusResult,
 } from "@t3tools/contracts";
+import { isTemporaryWorktreeBranch } from "@t3tools/shared/git";
 export type GitActionIconName = "commit" | "push" | "pr";
     return null;
   }
+  if (
+    input.threadBranch !== null &&
+    input.gitStatus.branch !== null &&
+    !isTemporaryWorktreeBranch(input.threadBranch) &&
+    isTemporaryWorktreeBranch(input.gitStatus.branch)
+  ) {
+    return null;
+  }
   return {
     branch: input.gitStatus.branch,
   };