Skip to content

Use the --ignore-matching-lines flag of git diff. #2720

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jsdt merged 2 commits into from
May 12, 2025
Merged

Use the --ignore-matching-lines flag of git diff. #2720

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
832e442
Use the --ignore-matching-lines flag of git diff.
jsdt May 9, 2025
9adb31e
Merge branch 'master' into jsdt/simplify-check-diff
jsdt May 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 1 addition & 17 deletions tools/check-diff.sh
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,4 @@ GIT_ROOT="$(git rev-parse --show-toplevel)"
PATTERN='^// This was generated using spacetimedb cli version.*'
failed=0

for file in $(git diff --name-only -- "$SUBDIR"); do
echo "Checking file $file"
full_file="$GIT_ROOT/$file"
# Only check files that still exist in working dir
[ -f "$full_file" ] || continue

diff_out=$(diff -u --ignore-matching-lines="$PATTERN" \
<(git show HEAD:"$file" 2>/dev/null || cat /dev/null) "$full_file")
if [ $? -ne 0 ]; then
echo "Difference found in $file:"
echo "$diff_out"
echo # blank line for clarity
failed=1
fi
done

exit $failed
git diff --exit-code --ignore-matching-lines="$PATTERN" -- "$SUBDIR"
Loading