From 2e908e923c7fa55ab16386ea582f57b35e0affaa Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Wed, 25 Mar 2015 12:01:42 -0300
Subject: Fix module-update branch checkout

---
 TODO.md                   | 1 -
 share/hydra/module-update | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/TODO.md b/TODO.md
index 35704bd..917c076 100644
--- 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 0a9fc1a..b606132 100755
--- 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
 
-- 
cgit v1.2.3