summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-03-18 01:04:10 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-03-18 01:04:10 +0000
commit1a7af207ffc66c7378cba595a21b28579b0bffc1 (patch)
treeae02c4c3827263a6afb527089f7f07656039b952
parent73ef2acc09d512b338f1a1dd7c2c4abb2d3413bf (diff)
parent4412a834b3c82d38a97bf65d096acab72980e9f4 (diff)
Merge "f_repos: Set git patch format explicitly" into stable/danube
-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 \