aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorMaxim Uvarov <maxim.uvarov@linaro.org>2018-04-06 16:40:17 +0300
committerMaxim Uvarov <maxim.uvarov@linaro.org>2018-04-09 17:52:07 +0300
commit92ebb26bae583ff864bc4bef6a2776329527a069 (patch)
treebb63678dee523040df8f1944601e05166c536426 /scripts
parented4e1bfea15d8502e50b6c210f38dd3f13683d2f (diff)
travis: use -M option for generated patches
generate patches with -M (move) option to not validate moved files from stratch. Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer@linaro.org>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/ci-checkpatches.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/ci-checkpatches.sh b/scripts/ci-checkpatches.sh
index 798efe052..383045cd7 100755
--- a/scripts/ci-checkpatches.sh
+++ b/scripts/ci-checkpatches.sh
@@ -7,14 +7,14 @@ echo "Run checkpatch for ${PATCHES}"
# validate only the latest commit if it's not merge commit.
if [ "$PATCHES" = "" ]; then
- git format-patch -1 HEAD;
+ git format-patch -1 -M HEAD;
perl ./scripts/checkpatch.pl *.patch;
exit $?
fi
git show --summary HEAD| grep -q '^Merge:';
if [ $? -ne 0 ]; then
- git format-patch -1 HEAD;
+ git format-patch -1 -M HEAD;
perl ./scripts/checkpatch.pl *.patch;
exit $?
fi