Skip to content

Commit

Permalink
Reduce required context when applying patches
Browse files Browse the repository at this point in the history
Makes `git apply` match `patch`'s fuzzing a bit more closely.
  • Loading branch information
triplef committed Oct 14, 2024
1 parent 5dc7376 commit 7858c7f
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions scripts/common.bat
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,14 @@ exit /b %errorlevel%
for /F "tokens=*" %%P in ('dir /b /s ^"%ROOT_DIR%\patches\%PROJECT%-*.patch^" 2^>nul') do (
echo.
echo ### Applying %%~nxP
git apply %%P || exit /b 1
git apply -C1 %%P || exit /b 1
)

if defined ADDITIONAL_PATCHES_DIR (
for /F "tokens=*" %%P in ('dir /b /s ^"%ADDITIONAL_PATCHES_DIR%\%PROJECT%-*.patch^" 2^>nul') do (
echo.
echo ### Applying %%~nxP
git apply %%P || exit /b 1
git apply -C1 %%P || exit /b 1
)
)

Expand Down

0 comments on commit 7858c7f

Please sign in to comment.