nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't warn about whitespace when patching

Browse Source
This commit is contained in:
Matthias Schiffer 2014-01-11 13:42:09 +01:00
parent 42f4275501
commit cacf010f4a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/patch.sh
View File

@ -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