summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-03-17 16:42:51 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-03-17 16:42:51 +0000
commit804e73a5b96345185b6228c6dc2c68afaa26f02e (patch)
tree6b5c2cb512695be9cf347553d8ae51a83371f098 /build
parentf20bfafbcb3e75f13b5ba2955ec38f13baad452d (diff)
parent672c1df70b8cafe61a3edaa66fbf9e8dba2b12e2 (diff)
Merge "f_repos: Set git patch format explicitly"
Diffstat (limited to 'build')
-rw-r--r--build/f_repos/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/build/f_repos/Makefile b/build/f_repos/Makefile
index be6f82909..5dd1c1e7f 100644
--- a/build/f_repos/Makefile
+++ b/build/f_repos/Makefile
@@ -89,7 +89,8 @@ patches-import: sub .cachepatched
SUB_FEATURE=$${p_dir#$$SUB_DIR}; \
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 \
+ git tag $$SUB_TAG-root && \
+ git am -3 --whitespace=nowarn --patch-format=mbox \
--committer-date-is-author-date $$SUB_PATCHES && \
git tag $$SUB_TAG || exit 1; \
fi \