diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2015-03-24 16:06:05 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2015-03-24 16:06:05 -0300 |
| commit | 30b813bf64d200d560bb1d5aef9e6a22e651a7cf (patch) | |
| tree | 38ffe8abc71f689c0c54538fb7a1e266225e077a | |
| parent | eccfe05e99a17b1a8e38dc0cfc0ad79632b5e4ac (diff) | |
| download | hydra-30b813bf64d200d560bb1d5aef9e6a22e651a7cf.tar.gz hydra-30b813bf64d200d560bb1d5aef9e6a22e651a7cf.tar.bz2 | |
Allow module-verify to work with different branchs, but stay strict
| -rwxr-xr-x | share/hydra/module-verify | 9 |
1 files changed, 6 insertions, 3 deletions
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 |