如何在Git交互式暂存/检出中通过正则表达式过滤代码块？

Great question! I’ve been there—stuck scrolling through dozens of irrelevant hunks in git add -p or git checkout -p when I only care about changes matching a specific pattern. The --word-diff-regex flag works great for viewing diffs but doesn’t help with interactive patch operations, so here’s a solid solution that works for both commands:

Step 1: Create a Custom External Diff Script #

First, whip up a simple script that filters diff hunks to only those containing your target regex. Save this as git-filter-diff.sh somewhere in your PATH (like ~/bin/ so Git can find it):

#!/bin/bash
# Custom diff script to filter hunks by regex pattern
# Usage: Set PATCH_FILTER environment variable to your regex before running git commands

# Skip filtering if no pattern is set (fallback to normal diff)
if [ -z "$PATCH_FILTER" ]; then
    diff -u "$2" "$5"
    exit 0
fi

# Generate unified diff and filter hunks that match your pattern
diff -u "$2" "$5" | awk -v pattern="$PATCH_FILTER" '
/^@@/{
    # Save the hunk header and reset our "keep" flag
    hunk_header = $0
    keep_hunk = 0
    next
}
# If the current line matches our regex, mark this hunk to keep
$0 ~ pattern {
    keep_hunk = 1
    print hunk_header
}
# Print the line if we’re keeping the current hunk
keep_hunk {
    print
}
'

Don’t forget to make it executable:

chmod +x ~/bin/git-filter-diff.sh

Step 2: Configure Git to Use the Script #

Tell Git to use this script as its diff tool when the PATCH_FILTER variable is set. Add these lines to your ~/.gitconfig file:

[diff "filter"]
    command = git-filter-diff.sh

Step 3: Use It with git add -p or git checkout -p #

Now you can filter interactive patch hunks by setting the PATCH_FILTER environment variable before running your command:

For git add -p (only show hunks matching your regex):

PATCH_FILTER="your-regex-here" git add -p --diff=filter

For git checkout -p HEAD~1 (only show hunks from HEAD~1 to current that match your regex):

PATCH_FILTER="your-regex-here" git checkout -p HEAD~1 --diff=filter

Bonus: Add Aliases for Ease of Use #

If you want to make this even quicker, add aliases to your ~/.gitconfig:

[alias]
    addp = !bash -c 'PATCH_FILTER="$1" git add -p --diff=filter' -
    checkoutp = !bash -c 'PATCH_FILTER="$1" git checkout -p "$2" --diff=filter' -

Then use them like this:

git addp "your-regex"
git checkoutp "your-regex" HEAD~1

Quick Notes #

• Use standard POSIX regex syntax for your pattern. If you need case-insensitive matching, add IGNORECASE=1 to the awk script line where pattern is defined.
• The script falls back to normal diff behavior if PATCH_FILTER isn’t set, so you can still use regular git add -p or git checkout -p without any changes.

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