From c5b1e791bdd4368e95ccadd0868677f4e043ede2 Mon Sep 17 00:00:00 2001
From: Lorenz Meier <lm@inf.ethz.ch>
Date: Sat, 13 Feb 2016 00:50:06 +0100
Subject: [PATCH] Update git check script. Fixes #3733

---
 Makefile                  | 3 +--
 Tools/check_submodules.sh | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index c066fd16a5..c94bdf3219 100644
--- a/Makefile
+++ b/Makefile
@@ -109,9 +109,8 @@ endif
 # describe how to build a cmake config
 define cmake-build
 +@if [ $(PX4_CMAKE_GENERATOR) = "Ninja" ] && [ -e $(PWD)/build_$@/Makefile ]; then rm -rf $(PWD)/build_$@; fi
-+git submodule init
-+Tools/check_submodules.sh 
 +@if [ ! -e $(PWD)/build_$@/CMakeCache.txt ]; then git submodule sync && git submodule init && mkdir -p $(PWD)/build_$@ && cd $(PWD)/build_$@ && cmake .. -G$(PX4_CMAKE_GENERATOR) -DCONFIG=$(1); fi
++Tools/check_submodules.sh
 +$(PX4_MAKE) -C $(PWD)/build_$@ $(PX4_MAKE_ARGS) $(ARGS)
 endef
 
diff --git a/Tools/check_submodules.sh b/Tools/check_submodules.sh
index cac39664ee..3158f77329 100755
--- a/Tools/check_submodules.sh
+++ b/Tools/check_submodules.sh
@@ -20,13 +20,13 @@ function check_git_submodule {
 if [ -d $1 ];
 	then
 	SUBMODULE_STATUS=$(git submodule summary "$1")
-	STATUSRETVAL=$(echo $SUBMODULE_STATUS | grep -A20 -i "$1" | grep "<")
+	STATUSRETVAL=$(echo $SUBMODULE_STATUS | grep -A20 -i "$1")
 	if [ -z "$STATUSRETVAL" ]; then
 		echo "Checked $1 submodule, correct version found"
 	else
 		echo -e "\033[31mChecked $1 submodule, ACTION REQUIRED:\033[0m"
 		echo ""
-		echo -e "New commits required:"
+		echo -e "Different commits:"
 		echo -e "$SUBMODULE_STATUS"
 		echo ""
 		echo ""