From 7652d579f587c3202d1d80464557cfaa8005b3de Mon Sep 17 00:00:00 2001
From: Jesse Duffield <jessedduffield@gmail.com>
Date: Sat, 13 Jul 2024 13:34:35 +1000
Subject: [PATCH] Check for fixup commits on CI

I keep merging PRs that still have fixup commits on them! This will make
it impossible to do so
---
 .github/workflows/ci.yml    | 22 ++++++++++++++++++++++
 scripts/check_for_fixups.sh | 25 +++++++++++++++++++++++++
 2 files changed, 47 insertions(+)
 create mode 100755 scripts/check_for_fixups.sh

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 64c890894c8..9b0a04938d5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -219,3 +219,25 @@ jobs:
           CODACY_PROJECT_TOKEN=${{ secrets.CODACY_PROJECT_TOKEN }} \
             bash <(curl -Ls https://coverage.codacy.com/get.sh) report \
             --force-coverage-parser go -r coverage.out
+
+  check-for-fixups:
+    runs-on: ubuntu-latest
+    if: github.ref != 'refs/heads/master'
+    steps:
+      # See https://github.com/actions/checkout/issues/552#issuecomment-1167086216
+      - name: "PR commits + 1"
+        run: echo "PR_FETCH_DEPTH=$(( ${{ github.event.pull_request.commits }} + 1 ))" >> "${GITHUB_ENV}"
+
+      - name: "Checkout PR branch and all PR commits"
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.pull_request.head.ref }}
+          fetch-depth: ${{ env.PR_FETCH_DEPTH }}
+
+      - name: "Fetch the other branch with enough history for a common merge-base commit"
+        run: |
+          git fetch origin ${{ github.event.pull_request.base.ref }}
+
+      - name: Check for fixups
+        run: |
+          ./scripts/check_for_fixups.sh ${{ github.event.pull_request.base.ref }}
diff --git a/scripts/check_for_fixups.sh b/scripts/check_for_fixups.sh
new file mode 100755
index 00000000000..c2c2e1a21ba
--- /dev/null
+++ b/scripts/check_for_fixups.sh
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+base_ref=$1
+
+# Determine the base commit
+base_commit=$(git merge-base HEAD origin/"$base_ref")
+
+# Check if base_commit is set correctly
+if [ -z "$base_commit" ]; then
+    echo "Failed to determine base commit."
+    exit 1
+fi
+echo "Base commit: $base_commit"
+
+# Get commits with "fixup!" in the message from base_commit to HEAD
+commits=$(git log -i -P --grep "fixup\!" --format="%h %s" "$base_commit..HEAD")
+
+if [ -z "$commits" ]; then
+    echo "No fixup commits found."
+    exit 0
+else
+    echo "Fixup commits found:"
+    echo "$commits"
+    exit 1
+fi