diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2015-03-25 12:01:42 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2015-03-25 12:01:42 -0300 |
| commit | 2e908e923c7fa55ab16386ea582f57b35e0affaa (patch) | |
| tree | 1b67229dd214fd7b8673cffad362c45809188043 | |
| parent | fea2ecd327eafaa81b8ff03aefe81a7a36c068eb (diff) | |
| download | hydra-2e908e923c7fa55ab16386ea582f57b35e0affaa.tar.gz hydra-2e908e923c7fa55ab16386ea582f57b35e0affaa.tar.bz2 | |
Fix module-update branch checkout
| -rw-r--r-- | TODO.md | 1 | ||||
| -rwxr-xr-x | share/hydra/module-update | 2 |
2 files changed, 1 insertions, 2 deletions
@@ -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 |