github
/
amigaos-cross-toolchain6
mirror of https://frontier.innolan.net/github/amigaos-cross-toolchain6.git
2
0
Fork 0
Code Releases Activity

@B fix update_sub: stop after merge if branch does not exist in submodule

This commit is contained in:
bebbo 2017-05-28 16:22:50 +02:00
parent 20529ff850
commit 7a92212f08
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
update_sub
View File

@ -90,7 +90,7 @@ else
# branch is now up to date # branch is now up to date
if [ "$4" != "" ]; then if [ "$4" != "" ]; then
# merge specified branch into "master / what's defined in .gitmodules" # merge specified branch into "master / what's defined in .gitmodules"
git merge "$4" git merge "$4" || exit 0
git push git push
# add the changes to the master module # add the changes to the master module
pushd "$2" pushd "$2"
@ -98,4 +98,3 @@ else
popd popd
fi fi
fi fi