Skip to content

Commit ea418d5

Browse files
authored
Use the --ignore-matching-lines flag of git diff. (#2720)
1 parent 373e47d commit ea418d5

1 file changed

Lines changed: 1 addition & 17 deletions

File tree

tools/check-diff.sh

100644100755
Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,4 @@ GIT_ROOT="$(git rev-parse --show-toplevel)"
1313
PATTERN='^// This was generated using spacetimedb cli version.*'
1414
failed=0
1515

16-
for file in $(git diff --name-only -- "$SUBDIR"); do
17-
echo "Checking file $file"
18-
full_file="$GIT_ROOT/$file"
19-
# Only check files that still exist in working dir
20-
[ -f "$full_file" ] || continue
21-
22-
diff_out=$(diff -u --ignore-matching-lines="$PATTERN" \
23-
<(git show HEAD:"$file" 2>/dev/null || cat /dev/null) "$full_file")
24-
if [ $? -ne 0 ]; then
25-
echo "Difference found in $file:"
26-
echo "$diff_out"
27-
echo # blank line for clarity
28-
failed=1
29-
fi
30-
done
31-
32-
exit $failed
16+
git diff --exit-code --ignore-matching-lines="$PATTERN" -- "$SUBDIR"

0 commit comments

Comments
 (0)