diff options
| author | Michael Forney <mforney@mforney.org> | 2016-06-27 23:14:43 -0700 |
|---|---|---|
| committer | Michael Forney <mforney@mforney.org> | 2016-06-27 23:54:20 -0700 |
| commit | 698113c957a7b8608dff5668af4f44cfd6800b46 (patch) | |
| tree | 2d9dc10ea8d05fce0cd0a14712925745bdc89cea /scripts | |
| parent | f32b910fcd18af6488d0d7b40001274efdc7565c (diff) | |
Don't warn about whitespace errors when applying patches
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/fetch-curl.rc | 2 | ||||
| -rwxr-xr-x | scripts/fetch-git.rc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/fetch-curl.rc b/scripts/fetch-curl.rc index 2926a9f0..5fd8b681 100755 --- a/scripts/fetch-curl.rc +++ b/scripts/fetch-curl.rc @@ -33,6 +33,6 @@ for(archive in `{awk '{print $2}' sha256}) { if([ -d patch ]) { if(prefix=`{git rev-parse --show-prefix >[2]/dev/null}) dir=$prefix^src if not dir=src - git apply -v --directory $dir patch/* + git apply -v '--whitespace=nowarn' --directory $dir patch/* } status=() diff --git a/scripts/fetch-git.rc b/scripts/fetch-git.rc index fec6a809..c01de87b 100755 --- a/scripts/fetch-git.rc +++ b/scripts/fetch-git.rc @@ -12,6 +12,6 @@ cd $1 git submodule update --init --checkout src if([ -d patch ]) { patches=patch/* - git -C src am ../$patches + git -C src am '--whitespace=nowarn' ../$patches } status=() |
