Skip to content

Commit 08dc640

Browse files
committed
fix: stop ignoring whitespace in patches
1 parent 033400c commit 08dc640

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

scripts/apply.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ function applyPatch {
6161
git reset --hard upstream/upstream
6262
echo " Applying patches to $target..."
6363
git am --abort >/dev/null 2>&1
64-
if ! git am --3way --ignore-whitespace "$basedir/patches/$patch_folder/"*.patch
64+
if ! git am --3way "$basedir/patches/$patch_folder/"*.patch
6565
then
6666
echo " Something did not apply cleanly to $target."
6767
echo " Please review above details and finish the apply then"

0 commit comments

Comments
 (0)