Ensure the submodule has a branch at module-update

diff --git a/TODO.md b/TODO.md
index 6cba84ccf49149315f8fed86b35d9de7557e6883..35704bd83b1a6314b7b1bbef29da724786634d32 100644 (file)
--- a/TODO.md
+++ b/TODO.md
@@ -91,6 +91,8 @@ Puppet modules
     - force option via rsync/rdiff handlers
   - 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.
@@ -108,9 +110,8 @@ Puppet modules
   - puppetlast.
   - bug report: debian wheezy puppetmaster-passenger: not honoring certname / envvars LANG issue.
   - bug report: debian wheezy puppet-common: needs the following patch: http://projects.puppetlabs.com/issues/10963
-- backup:
-  - `sync-media-iterate [volume]`.
-  - merge feature/autoload
+- backup: `sync-media-iterate [volume]`.
+- backupninja: parametrized classes without dynamic lookups.
 - munin: enable/disable cgi graphing.
 - mysql:
   - prefetech: https://github.com/DavidS/puppet-mysql-old/issues/3

diff --git a/share/hydra/module-update b/share/hydra/module-update
index f4c70c79532fcaa2a7addda89961508de04e545f..0a9fc1a16f09750aebe6deb0e922e3f736332f4d 100755 (executable)
--- a/share/hydra/module-update
+++ b/share/hydra/module-update
@@ -34,7 +34,16 @@ function hydra_module_update {
   fi
   
   # Update the module
-  ( cd $PUPPET/modules/$MODULE; git pull )
+  (
+    cd $PUPPET/modules/$MODULE
+
+    # Ensure the submodule has a branch
+    if git branch | grep -q "(no branch)"; then
+      git checkout master
+    fi
+
+    git pull
+  )
   
   # Verify the module
   if ! hydra $HYDRA module-verify $MODULE; then