@openthink/stamp 1.1.0 → 1.2.0

package/dist/hooks/pre-receive.cjs

@@ -7532,6 +7532,15 @@ function verifyRef(oldSha, newSha, refname) {
       `push is not fast-forward (old ${oldSha.slice(0, 8)} is not an ancestor of new ${newSha.slice(0, 8)}). Force-push to a protected branch is not allowed.`
     );
   }
+  const liveTip = readLiveRef(refname);
+  if (liveTip !== null && liveTip !== oldSha) {
+    if (!isAncestor(liveTip, newSha)) {
+      reject(
+        refname,
+        `concurrent push detected: live tip is ${liveTip.slice(0, 8)} but this push expected ${oldSha.slice(0, 8)}, and new ${newSha.slice(0, 8)} is not a descendant of the live tip. Fetch the latest main and re-run stamp merge so your work lands on top of the current tip.`
+      );
+    }
+  }
   const trustedKeys = readTrustedKeysAt(oldSha);
   const newCommits = listNewCommits(oldSha, newSha);
   for (const sha of newCommits) {
@@ -7839,6 +7848,16 @@ function readTrustedKeysAt(sha) {
   }
   return map;
 }
+function readLiveRef(refname) {
+  try {
+    return (0, import_node_child_process.execFileSync)("git", ["rev-parse", "--verify", refname], {
+      encoding: "utf8",
+      stdio: ["ignore", "pipe", "pipe"]
+    }).trim();
+  } catch {
+    return null;
+  }
+}
 function isAncestor(ancestor, descendant) {
   try {
     (0, import_node_child_process.execFileSync)(