From: Silvio Rhatto <rhatto@riseup.net>
Date: Tue, 24 Mar 2015 19:06:05 +0000 (-0300)
Subject: Allow module-verify to work with different branchs, but stay strict
X-Git-Tag: 0.2.4~339
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=30b813bf64d200d560bb1d5aef9e6a22e651a7cf;p=hydra.git

Allow module-verify to work with different branchs, but stay strict
---

diff --git a/share/hydra/module-verify b/share/hydra/module-verify
index 29e9930..19cfd73 100755
--- a/share/hydra/module-verify
+++ b/share/hydra/module-verify
@@ -35,11 +35,14 @@ HASH_SUBMODULE="`git submodule | grep -E "modules/$MODULE( |$)" | awk '{ print $
 
 cd $HYDRA_FOLDER/modules/$MODULE
 
-HASH_MODULE="`git log -1 "$HASH_SUBMODULE" | head -n 1 | awk '{ print $2 }' | sed -e 's/\+//'`"
+BRANCH="`git branch`"
+HASH_MODULE="`git log -1 | grep "^commit" | awk '{ print $2 }' | sed -e 's/\+//'`"
 
 if [ "$HASH_MODULE" != "$HASH_SUBMODULE" ]; then
-  echo "Module $MODULE: commit not found!:"
-  echo "Commit: $HASH_SUBMODULE"
+  echo "Module $MODULE: hash differ!!:"
+  echo "Module:    $HASH_MODULE"
+  echo "Submodule: $HASH_SUBMODULE"
+  echo "Branch: $BRANCH"
   exit 1
 fi