Merge branch 'master' into 'master'

#1 make the check for changes use the correct branch

See merge request ansible-roles/drupal!3

templates/scripts/update/update.jinja2

@@ -11,10 +11,12 @@ date
 {% set path=[webRoot, drupal.src.git.target2|default(drupal.src.git.target)]|join('') %}
 cd {{ path }}
 
+branch="$(git rev-parse --abbrev-ref HEAD)"
+
 if [ $force -eq 0 ]; then
   echo '> check for changes'
   OUTPUT=$(git remote show origin)
-  if [[ $OUTPUT == *"master pushes to master (up to date)"* ]]; then
+  if [[ $OUTPUT == *"pushes to $branch (up to date)"* ]]; then
     echo "> unchanged, cancel"
     exit
   fi
@@ -39,7 +41,6 @@ if [ -f 'ansible.sh' ]; then
   ./ansible.sh
 fi
 
-branch="$(git rev-parse --abbrev-ref HEAD)"
 echo "> git pull $branch"
 git pull origin "$branch"