Fix module-update branch checkout

diff --git a/TODO.md b/TODO.md
index 35704bd83b1a6314b7b1bbef29da724786634d32..917c076ea15f4dc273d9a075ec0538e0f838b8d7 100644 (file)
--- a/TODO.md
+++ b/TODO.md
@@ -92,7 +92,6 @@ Puppet modules
   - enable ecdsa key
 - general:
   - features/autoload: nodo, virtual, dhcp and others
-  - module-update: nodo backup git websites
   - rollback of commits about charset.
   - switch to conf.d:
     - php ("refactor" branch), remove E_STRICT from production's error_reporting.

diff --git a/share/hydra/module-update b/share/hydra/module-update
index 0a9fc1a16f09750aebe6deb0e922e3f736332f4d..b606132e071bb912ee3664f46e2a127f2922cdde 100755 (executable)
--- a/share/hydra/module-update
+++ b/share/hydra/module-update
@@ -38,7 +38,7 @@ function hydra_module_update {
     cd $PUPPET/modules/$MODULE
 
     # Ensure the submodule has a branch
-    if git branch | grep -q "(no branch)"; then
+    if git branch | head -1 | grep -q -E "no branch|detached"; then
       git checkout master
     fi