X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=35a3f08c0c1f0370e41473c535ca1caa17c29ac3;hb=d7fdf2fe5dc992bbd155e9a86b1c02d14be5c3ba;hp=9ba6d9cb20d52846708091706a9e75616fa44b57;hpb=4c4c87b441e003572dfec3b95f5c4bcdb428d237;p=armband.git diff --git a/Makefile b/Makefile index 9ba6d9cb..35a3f08c 100644 --- a/Makefile +++ b/Makefile @@ -90,7 +90,8 @@ patches-import: .submodules-init .submodules-patched SUB_FEATURE=$${p_dir#$$SUB_DIR} \ SUB_TAG=${A_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 \