@casomoltd/tooling 0.27.0 → 0.28.0

package/README.md

@@ -21,7 +21,8 @@ Shared linting, formatting, commit config, and CLI tools for Casomo Ltd's repos.
 | Command | Description |
 |---|---|
 | `check-version` | Pre-push guard — rejects push if `package.json` version hasn't changed vs `origin/main` |
-| `pre-push` | Husky pre-push hook — runs check, build, then version/tag guards |
+| `check-linear` | Pre-push guard — rejects a push that would put a merge commit on the remote. History is linear; a branch catches up by rebasing. Only what the push adds is judged, so merges already on the remote stay |
+| `pre-push` | Husky pre-push hook — runs check, then the version, tag and linear-history guards |
 | `pre-commit` | Husky pre-commit hook — runs `npm run check` |
 | `commit-msg` | Husky commit-msg hook — runs commitlint |
 | `readability` | Measure reading difficulty of page content |

package/bin/check-linear.sh

@@ -0,0 +1,47 @@
+#!/bin/sh
+# Refuse a push that would put a merge commit on the remote.
+#
+# History is linear here: a branch catches up by rebasing, never by merging.
+# A merge commit costs the thing a linear history is kept for — `git log` on a
+# file stops being the list of changes to it, `git bisect` has two parents to
+# choose between, and a revert has to name which side it means.
+#
+# The forge refuses merges made through its own UI; this refuses the other
+# route, which is a local `git merge` followed by an ordinary push. Both are
+# needed: neither covers the other.
+#
+# Only what the push would ADD is judged. A merge already on the remote stays
+# where it is, because rewriting shared history to satisfy a new rule costs
+# more than the rule is worth.
+
+STATUS=0
+
+while read -r _ LOCAL_SHA REMOTE_REF REMOTE_SHA; do
+  # A deletion pushes the zero sha and adds nothing.
+  case "$LOCAL_SHA" in
+    *[!0]*) ;;
+    *) continue ;;
+  esac
+
+  case "$REMOTE_SHA" in
+    # A new branch: everything on it that no remote already has.
+    *[!0]*) RANGE="$REMOTE_SHA..$LOCAL_SHA" ;;
+    *) RANGE="$LOCAL_SHA --not --remotes" ;;
+  esac
+
+  # shellcheck disable=SC2086  # RANGE carries its own arguments.
+  MERGES=$(git rev-list --merges $RANGE 2>/dev/null)
+
+  if [ -n "$MERGES" ]; then
+    COUNT=$(printf '%s\n' "$MERGES" | wc -l | tr -d ' ')
+    echo "$REMOTE_REF would gain $COUNT merge commit(s):"
+    printf '%s\n' "$MERGES" | while read -r SHA; do
+      echo "  $(git log --format='%h %s' -1 "$SHA")"
+    done
+    echo "History is linear here. Rebase instead:"
+    echo "  git rebase main"
+    STATUS=1
+  fi
+done
+
+exit $STATUS

package/bin/pre-push.sh

@@ -16,4 +16,5 @@ export PRE_PUSH_REFS
 # simply doesn't.
 npm run check \
   && echo "$PRE_PUSH_REFS" | check-version \
-  && echo "$PRE_PUSH_REFS" | check-tags
+  && echo "$PRE_PUSH_REFS" | check-tags \
+  && echo "$PRE_PUSH_REFS" | check-linear

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@casomoltd/tooling",
-  "version": "0.27.0",
+  "version": "0.28.0",
   "description": "Casomo's shared dev config: ESLint, Prettier, commitlint, knip & jscpd presets and dev CLIs (git hooks, readability, screenshots)",
   "license": "MIT",
   "repository": {
@@ -49,6 +49,7 @@
   "bin": {
     "build-report": "./bin/build-report.mjs",
     "check-gates": "./bin/check-gates.mjs",
+    "check-linear": "./bin/check-linear.sh",
     "check-private-refs": "./bin/check-private-refs.mjs",
     "check-tags": "./bin/check-tags.sh",
     "check-version": "./bin/check-version.sh",