如何实现GitHub热修复PR自动以源分支作为基分支？

Hey there! It’s super frustrating when devs keep accidentally targeting main instead of the original release branch for their hotfix PRs. Let’s walk through a few solid solutions that don’t require forcing everyone to install extra GitHub tools:

1. GitHub Actions: Auto-Correct PR Base Branch (Team-Wide Fix) #

This is the most hands-off solution for your whole team—set it up once in the repo, and it’ll handle the rest automatically.

How to implement: #

Create a new workflow file at .github/workflows/fix-hotfix-pr-base.yml with this code:

name: Auto-Fix Hotfix PR Base Branch
on:
  pull_request:
    types: [opened, reopened]

jobs:
  adjust-base:
    runs-on: ubuntu-latest
    steps:
      - name: Detect and fix misconfigured hotfix PRs
        env:
          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        run: |
          # Grab PR details
          HEAD_BRANCH="${{ github.head_ref }}"
          CURRENT_BASE="${{ github.base_ref }}"
          
          # Only act on hotfix branches (matching your naming pattern) targeting main
          if [[ $HEAD_BRANCH =~ ^.+\/.+$ && $CURRENT_BASE == "main" ]]; then
              # Fetch the branch's creation context to find the original release branch
              # Get the SHA the hotfix branch was created from
              BRANCH_SHA=$(gh api repos/${{ github.repository }}/git/refs/heads/$HEAD_BRANCH --jq '.object.sha')
              
              # Find which release branch contains this SHA (our source branch)
              TARGET_BASE=$(gh api repos/${{ github.repository }}/branches --jq --arg sha "$BRANCH_SHA" '.[] | select(.commit.sha == $sha) | .name')
              
              # If we found a matching release branch, update the PR
              if [[ -n $TARGET_BASE ]]; then
                  gh api -X PATCH repos/${{ github.repository }}/pulls/${{ github.event.pull_request.number }} \
                    -f base="$TARGET_BASE"
                  echo "✅ Updated PR base branch to $TARGET_BASE"
              fi
          fi

This workflow triggers every time a PR is opened or reopened:

• It checks if the PR comes from a hotfix-style branch (like yourName/yourTicketNumber) and is accidentally targeting main
• It uses the GitHub API to trace back which release branch the hotfix was carved from
• It automatically updates the PR’s base branch to that release branch

No extra tools needed for devs—just enable Actions on your repo, and GITHUB_TOKEN is auto-provided by GitHub.

2. Local Git Hooks (Per-Dev Setup, No Extra Tools) #

If you prefer a client-side solution, you can set up Git hooks that track the original release branch when a hotfix is created, then auto-set the base when creating the PR.

Step 1: Add a post-checkout hook #

Create .git/hooks/post-checkout (make it executable with chmod +x .git/hooks/post-checkout) with this script:

#!/bin/bash
# Track the source release branch when creating a new hotfix branch
if [[ $3 -eq 1 ]]; then  # $3 = 1 means we just created a new branch
    SOURCE_BRANCH=$(git rev-parse --abbrev-ref HEAD@{1})
    # Only track if we're branching from a release branch
    if [[ $SOURCE_BRANCH =~ ^release_.+$ ]]; then
        echo "$SOURCE_BRANCH" > .git/hotfix_source_branch
    fi
fi

This saves the original release branch name to a temporary file whenever someone creates a hotfix branch from it.

Step 2: Add a PR creation script #

Drop a script like scripts/create-hotfix-pr.sh in your repo (make it executable):

#!/bin/bash
# Read the saved source release branch
SOURCE_BRANCH=$(cat .git/hotfix_source_branch 2>/dev/null)
CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)

if [[ -n $SOURCE_BRANCH ]]; then
    # Use curl to create the PR directly with the correct base branch
    curl -X POST -H "Authorization: token $GITHUB_TOKEN" \
      "https://api.github.com/repos/[YOUR_REPO_OWNER]/[YOUR_REPO_NAME]/pulls" \
      -d '{
          "title": "Hotfix: '$(git log --oneline -1 | cut -d " " -f 2-)'",
          "head": "'$CURRENT_BRANCH'",
          "base": "'$SOURCE_BRANCH'"
      }'
    # Clean up the temp file
    rm .git/hotfix_source_branch
else
    echo "⚠️ No release branch source found—opening standard PR page"
    open "https://github.com/[YOUR_REPO_OWNER]/[YOUR_REPO_NAME]/pull/new/$CURRENT_BRANCH"
fi

Devs just run ./scripts/create-hotfix-pr.sh instead of manually opening a PR, and it’ll auto-target the right release branch. They just need to set a personal GITHUB_TOKEN in their environment once.

3. PR Template + Documentation (Low-Touch Reminder) #

While not fully automatic, adding clear reminders can cut down on mistakes:

• Create a .github/PULL_REQUEST_TEMPLATE.md with a bold warning:

⚠️ HOTFIX CHECK: If this is a hotfix branch (format: yourName/yourTicketNumber), PLEASE SET THE BASE BRANCH TO THE ORIGINAL release_xxxx BRANCH (not main!)

• Update your repo’s CONTRIBUTING.md to explicitly call out this step in the hotfix workflow, so it’s front-and-center for new and existing devs.

内容的提问来源于stack exchange，提问作者Dean Hiller