@rtrentjones/greenlight 0.2.13 → 0.2.14

package/dist/bin.js

@@ -413,7 +413,7 @@ function tokensForTool(tool) {
 }
 
 // src/version.ts
-var MODULE_REF = "v0.2.13";
+var MODULE_REF = "v0.2.14";
 var MODULE_SOURCE_BASE = "git::https://github.com/RTrentJones/greenlight.git//infra/modules";
 function moduleSource(module, ref = MODULE_REF) {
   return `${MODULE_SOURCE_BASE}/${module}?ref=${ref}`;
@@ -2414,16 +2414,24 @@ function git(repoDir, args) {
 function gitOut(repoDir, args) {
   return execFileSync5("git", args, { cwd: repoDir, encoding: "utf8" }).trim();
 }
+function resolveRef(repoDir, branch) {
+  for (const ref of [branch, `origin/${branch}`]) {
+    try {
+      git(repoDir, ["rev-parse", "--verify", "--quiet", ref]);
+      return ref;
+    } catch {
+    }
+  }
+  return null;
+}
 function canPromote(repoDir, from = "develop", to = "main") {
-  const run2 = (args) => git(repoDir, args);
-  try {
-    run2(["rev-parse", "--verify", "--quiet", from]);
-    run2(["rev-parse", "--verify", "--quiet", to]);
-  } catch {
+  const fromRef = resolveRef(repoDir, from);
+  const toRef = resolveRef(repoDir, to);
+  if (!fromRef || !toRef) {
     return { canPromote: false, reason: `branch "${from}" or "${to}" not found in ${repoDir}` };
   }
   try {
-    run2(["merge-base", "--is-ancestor", to, from]);
+    git(repoDir, ["merge-base", "--is-ancestor", toRef, fromRef]);
     return { canPromote: true, reason: `"${to}" can fast-forward to "${from}"` };
   } catch {
     return {
@@ -2437,25 +2445,25 @@ function promote(repoDir, opts = {}) {
   const to = opts.to ?? "main";
   const check = canPromote(repoDir, from, to);
   if (!check.canPromote) return { promoted: false, from, to, reason: check.reason };
-  const original = gitOut(repoDir, ["rev-parse", "--abbrev-ref", "HEAD"]);
-  try {
-    git(repoDir, ["checkout", to]);
-    git(repoDir, ["merge", "--ff-only", from]);
-    if (opts.push) git(repoDir, ["push", "origin", to]);
-  } finally {
-    if (original && original !== "HEAD" && original !== to) {
+  const fromRef = resolveRef(repoDir, from);
+  const fromCommit = gitOut(repoDir, ["rev-parse", fromRef]);
+  const current = gitOut(repoDir, ["rev-parse", "--abbrev-ref", "HEAD"]);
+  if (opts.push) {
+    git(repoDir, ["push", "origin", `${fromCommit}:refs/heads/${to}`]);
+    if (current !== to) {
       try {
-        git(repoDir, ["checkout", original]);
+        git(repoDir, ["update-ref", `refs/heads/${to}`, fromCommit]);
       } catch {
       }
     }
+    return { promoted: true, from, to, reason: `"${to}" fast-forwarded to "${from}" and pushed` };
   }
-  return {
-    promoted: true,
-    from,
-    to,
-    reason: `"${to}" fast-forwarded to "${from}"${opts.push ? " and pushed" : ""}`
-  };
+  if (current === to) {
+    git(repoDir, ["merge", "--ff-only", fromRef]);
+  } else {
+    git(repoDir, ["update-ref", `refs/heads/${to}`, fromCommit]);
+  }
+  return { promoted: true, from, to, reason: `"${to}" fast-forwarded to "${from}"` };
 }
 
 // src/commands/promote.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rtrentjones/greenlight",
-  "version": "0.2.13",
+  "version": "0.2.14",
   "description": "Greenlight CLI — setup and lifecycle for the harness.",
   "license": "MIT",
   "repository": {
@@ -32,9 +32,9 @@
   },
   "devDependencies": {
     "@rtrentjones/greenlight-adapters": "0.2.4",
-    "@rtrentjones/greenlight-shared": "0.2.4",
+    "@rtrentjones/greenlight-loop": "0.2.4",
     "@rtrentjones/greenlight-verify": "0.2.4",
-    "@rtrentjones/greenlight-loop": "0.2.4"
+    "@rtrentjones/greenlight-shared": "0.2.4"
   },
   "scripts": {
     "build": "node scripts/copy-assets.mjs && tsup",