瀏覽代碼

Don't warn about whitespace when patching

Matthias Schiffer 10 年之前
父節點
當前提交
cacf010f4a
共有 1 個文件被更改,包括 1 次插入1 次删除
  1. 1 1
      scripts/patch.sh

+ 1 - 1
scripts/patch.sh

@@ -10,7 +10,7 @@ for module in $GLUON_MODULES; do
 	git checkout -B patching base
 
 	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 checkout patched
 			git branch -D patching