Skip to content
Snippets Groups Projects
Commit cacf010f authored by Matthias Schiffer's avatar Matthias Schiffer
Browse files

Don't warn about whitespace when patching

parent 42f42755
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 1 deletion
scripts/patch.sh
+ 1
− 1
View file @ cacf010f
...@@ -10,7 +10,7 @@ for module in $GLUON_MODULES; do ...@@ -10,7 +10,7 @@ for module in $GLUON_MODULES; do
git checkout -B patching base git checkout -B patching base
if [ "$(echo "$1"/patches/$module/*.patch)" ]; then if [ "$(echo "$1"/patches/$module/*.patch)" ]; then
git am "$1"/patches/$module/*.patch || ( git am --whitespace=nowarn "$1"/patches/$module/*.patch || (
git am --abort git am --abort
git checkout patched git checkout patched
git branch -D patching git branch -D patching
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

Impressum - Datenschutz