Update update script
Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>
This commit is contained in:
@@ -16,14 +16,16 @@ for path in ${paths}; do
|
|||||||
echo "Processing submodule: ${path}"
|
echo "Processing submodule: ${path}"
|
||||||
|
|
||||||
cd "${path}" || exit
|
cd "${path}" || exit
|
||||||
git checkout master
|
|
||||||
git fetch upstream
|
|
||||||
git merge upstream/master
|
|
||||||
|
|
||||||
branches=$(git for-each-ref --format='%(refname:short)' refs/heads/ | grep -v '^master$')
|
default_branch=$(git remote show origin | awk '/HEAD branch/ {print $NF}')
|
||||||
|
git checkout "${default_branch}"
|
||||||
|
git fetch upstream
|
||||||
|
git merge "upstream/${default_branch}"
|
||||||
|
|
||||||
|
branches=$(git for-each-ref --format='%(refname:short)' refs/heads/ | grep -v "^${default_branch}$")
|
||||||
for branch in ${branches}; do
|
for branch in ${branches}; do
|
||||||
git checkout "${branch}"
|
git checkout "${branch}"
|
||||||
git rebase master
|
git rebase "${default_branch}"
|
||||||
done
|
done
|
||||||
|
|
||||||
git checkout integration
|
git checkout integration
|
||||||
|
Reference in New Issue
Block a user