summaryrefslogtreecommitdiffstats
path: root/mcp/patches/Makefile
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-09-04 16:41:43 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-09-04 16:41:43 +0000
commit978fd9da91b6cdd522e79a4b8c31cf8f800222a3 (patch)
treead7ce00712ea2d93d31491870c796c5613c8bc0f /mcp/patches/Makefile
parent405d814aa17b6cb52bf2fd26c1fec62679e8ff5e (diff)
parentbb2dc1e4d661b51c561a60530639ba439d824870 (diff)
Merge "salt.sh, user-data: Add Saltstack arm64 repo"
Diffstat (limited to 'mcp/patches/Makefile')
-rw-r--r--mcp/patches/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/mcp/patches/Makefile b/mcp/patches/Makefile
index 061c647e6..dc87832b8 100644
--- a/mcp/patches/Makefile
+++ b/mcp/patches/Makefile
@@ -87,7 +87,7 @@ patches-import: sub .cachepatched
SUB_TAG=${F_OPNFV_TAG}-fuel$$SUB_FEATURE/patch; \
echo "`tput setaf 2`-- patching $$name ($$SUB_TAG)`tput sgr0`";\
git tag $$SUB_TAG-root && \
- git am -3 --whitespace=nowarn --patch-format=mbox \
+ git am -3 --ignore-whitespace --patch-format=mbox \
--committer-date-is-author-date $$SUB_PATCHES && \
git tag $$SUB_TAG || exit 1; \
fi \