diff options
| author | Pavel Kirienko <pavel.kirienko@gmail.com> | 2014-07-12 17:38:49 +0400 |
|---|---|---|
| committer | Pavel Kirienko <pavel.kirienko@gmail.com> | 2014-07-12 17:38:49 +0400 |
| commit | 9a56892c2b48f7cd25358f9d21076443ef252eff (patch) | |
| tree | 2996d8a04e9dde51a21382e030974a08f53dfa6e /Tools/check_submodules.sh | |
| parent | e64a28e736224da5d1db8e3477eeeffc0b3b1f6c (diff) | |
| parent | 66e840ebd784c376aeb8c447541d17ab3fa9cf0f (diff) | |
| download | px4-firmware-9a56892c2b48f7cd25358f9d21076443ef252eff.tar.gz px4-firmware-9a56892c2b48f7cd25358f9d21076443ef252eff.tar.bz2 px4-firmware-9a56892c2b48f7cd25358f9d21076443ef252eff.zip | |
Merge branch 'master' into uavcan
Diffstat (limited to 'Tools/check_submodules.sh')
| -rwxr-xr-x | Tools/check_submodules.sh | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/Tools/check_submodules.sh b/Tools/check_submodules.sh index a178b4a38..abe3088c7 100755 --- a/Tools/check_submodules.sh +++ b/Tools/check_submodules.sh @@ -2,12 +2,19 @@ if [ -d NuttX/nuttx ]; then - STATUSRETVAL=$(git status --porcelain | grep -i "NuttX") - if [ "$STATUSRETVAL" == "" ]; then + STATUSRETVAL=$(git submodule summary | grep -A20 -i "NuttX" | grep "<") + if [ -z "$STATUSRETVAL" ]; then echo "Checked NuttX submodule, correct version found" else - echo "NuttX sub repo not at correct version. Try 'make updatesubmodules'" + echo "" + echo "" + echo "NuttX sub repo not at correct version. Try 'git submodule update'" echo "or follow instructions on http://pixhawk.org/dev/git/submodules" + echo "" + echo "" + echo "New commits required:" + echo "$(git submodule summary)" + echo "" exit 1 fi else @@ -18,12 +25,19 @@ fi if [ -d mavlink/include/mavlink/v1.0 ]; then - STATUSRETVAL=$(git status --porcelain | grep -i "mavlink/include/mavlink/v1.0") - if [ "$STATUSRETVAL" == "" ]; then + STATUSRETVAL=$(git submodule summary | grep -A20 -i "mavlink/include/mavlink/v1.0" | grep "<") + if [ -z "$STATUSRETVAL" ]; then echo "Checked mavlink submodule, correct version found" else - echo "mavlink sub repo not at correct version. Try 'make updatesubmodules'" + echo "" + echo "" + echo "mavlink sub repo not at correct version. Try 'git submodule update'" echo "or follow instructions on http://pixhawk.org/dev/git/submodules" + echo "" + echo "" + echo "New commits required:" + echo "$(git submodule summary)" + echo "" exit 1 fi else |