this repo has no description
Use stricter patch validation with git apply --check
Address reviewer feedback: use git apply --check to verify patches
apply cleanly before applying them. This prevents stale patches from
silently applying to wrong lines if the upstream IDB source changes.
🤖 Generated with [Claude Code](https://claude.com/claude-code)
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
+8
-1
+8
-1
scripts/build.sh
+8
-1
scripts/build.sh
···
122
122
local patch_abs
123
123
patch_abs="$(cd "$(dirname "$patch_file")" && pwd)/$(basename "$patch_file")"
124
124
print_info " → $(basename "$patch_file")"
125
-
if ! (cd "$IDB_CHECKOUT_DIR" && patch -p1 -N < "$patch_abs"); then
125
+
# First verify patch applies cleanly with git apply --check
126
+
if ! (cd "$IDB_CHECKOUT_DIR" && git apply --check "$patch_abs" 2>/dev/null); then
127
+
echo "❌ Error: Patch $(basename "$patch_file") does not apply cleanly."
128
+
echo " The upstream IDB source may have changed. Please update the patch."
129
+
exit 1
130
+
fi
131
+
# Apply the patch
132
+
if ! (cd "$IDB_CHECKOUT_DIR" && git apply "$patch_abs"); then
126
133
echo "❌ Error: Failed to apply patch $(basename "$patch_file")"
127
134
exit 1
128
135
fi