From: Emilie <zawadzki@ircam.fr>
Date: Thu, 26 Oct 2017 17:22:59 +0000 (+0200)
Subject: Merge branch 'master' of github.com:Ircam-Web/mezzo-bin
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=2ecd3554e1839399f329b675d8e8660479dcead0;p=docker-django-scripts.git

Merge branch 'master' of github.com:Ircam-Web/mezzo-bin
---

2ecd3554e1839399f329b675d8e8660479dcead0
diff --cc update_submodules.sh
index 4e687a1,0000000..ea1f599
mode 100755,000000..100755
--- a/update_submodules.sh
+++ b/update_submodules.sh
@@@ -1,25 -1,0 +1,25 @@@
 +#!/bin/bash
 +
 +# The script detect the right main project branch, then update the submodule function of branch-[mainProjectBranch]
 +# For example, if you define these variables in .gitmodules :
 +# - branch-dev
 +# - branch-master
 +# If you are on dev branch in main project, the script will update submodule functions of branch-dev you've defined
 +# In main project, if you are in another branch than master or dev, it will take by default dev branch
 +# If you don't define any branches for you submodule, the script will update from master
 +
 +curr_branch=$(git symbolic-ref --short HEAD)
 +
 +echo $curr_branch
 +if [ $curr_branch != "master" ] && [ $curr_branch != "dev" ];
 +then
 +    curr_branch="dev"
 +fi
 +
- echo $curr_branch
++
 +#Synchronizes submodules' remote URL configuration setting to the value specified in .gitmodules
 +git submodule sync
 +# Checkout all submodules on right branches specified in .gitmodules, by default the branch is master
 +git submodule foreach --recursive 'git checkout $(git config -f $toplevel/.gitmodules submodule.$name.branch-'$curr_branch' || echo master)'
 +# Pull all submodules on right branches specified in .gitmodules, by default the branch is master
 +git submodule foreach --recursive 'git pull origin $(git config -f $toplevel/.gitmodules submodule.$name.branch-'$curr_branch' || echo master)'