chore: ignore PR merge commits to target branch at tip of history

Author: halms

git-branch-linearity.sh

@@ -6,16 +6,38 @@ TARGET_BRANCH="${1:-main}"
 echo "Target branch: $TARGET_BRANCH"
 git fetch origin $TARGET_BRANCH 2> /dev/null
 
-out=$(git log origin/${TARGET_BRANCH}..HEAD --merges --oneline)
+
+# If in a github PR, base from tip of branch, not the merge commit
+if [ -n "$GITHUB_HEAD_REF" ]; then
+    echo "GITHUB_HEAD_REF: $GITHUB_HEAD_REF"
+    echo "1: $(git rev-parse $GITHUB_HEAD_REF)"
+    echo "2: $(git rev-parse origin/$GITHUB_HEAD_REF)"
+    echo "3: $(git rev-parse refs/heads/$GITHUB_HEAD_REF)"
+    echo "4: $(git rev-parse refs/heads/origin/$GITHUB_HEAD_REF)"
+    git fetch --no-tags --depth=1 origin "$GITHUB_HEAD_REF"
+    echo "5: $(git rev-parse $GITHUB_HEAD_REF)"
+    echo "6: $(git rev-parse origin/$GITHUB_HEAD_REF)"
+    echo "7: $(git rev-parse refs/heads/$GITHUB_HEAD_REF)"
+    echo "8: $(git rev-parse refs/heads/origin/$GITHUB_HEAD_REF)"
+    echo "9: $(git rev-parse FETCH_HEAD)"
+    tip="$(git rev-parse FETCH_HEAD)"
+    echo "Tip: $tip"
+else
+    tip="HEAD"
+fi
+
+out=$(git log origin/${TARGET_BRANCH}..${tip} --merges --oneline)
 exit_status=$?
+
 if [ -n  "$out" ]
 then
     echo "Please rebase your branch" >&2
     echo "If your branch or its base branch is a release branch then ignore this error" >&2
-    echo "\nMerge commit(s):" >&2
+    echo >&2
+    echo "Merge commit(s):" >&2
     echo "$out" >&2
     # Disclaimer: current version of the check doesn't work well with release branches
     exit_status=1
 fi
-
-exit ${exit_status}
+exit 1
+#exit ${exit_status}