Commit 131e6b02 authored by Michal Berger's avatar Michal Berger Committed by Tomasz Zawadzki
Browse files

check_format: Mitigate #1455 



Make sure that git diff ignores all submodules while looking for
changes made by astyle. This should prevent the following issues
from occurring:

object directory /var/ci_repos/dpdk-submodule.git/objects does not exist; check .git/objects/info/alternates
object directory /var/ci_repos/intel-ipsec-mb.git/objects does not exist; check .git/objects/info/alternates
error: bad tree object HEAD
fatal: 'git status --porcelain=2' failed in submodule intel-ipsec-mb

Change-Id: Ie9a39e324674337fdbd6bf627da6e80775ceaeec
Signed-off-by: default avatarMichal Berger <michalx.berger@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/3223


Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarPaul Luse <paul.e.luse@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent 6ff8cd3d

scripts/check_format.sh

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ if hash astyle; then 
			| xargs -P$(nproc) -n10 astyle --options=.astylerc >> astyle.log

		if grep -q "^Formatted" astyle.log; then

			echo " errors detected"

			git diff

			git diff --ignore-submodules=all

			sed -i -e 's/  / /g' astyle.log

			grep --color=auto "^Formatted.*" astyle.log

			echo "Incorrect code style detected in one or more files."