ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #6310 from GabrielInTheWorld/dev

Browse Source 
Improves the 'services-to-master' function
This commit is contained in:
GabrielInTheWorld 2021-12-10 10:20:16 +01:00 committed by GitHub
commit 95504ce8c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
services-to-master.sh
View File

@ -19,13 +19,11 @@ function get_upstream_branch {
} }
function get_upstream_name { function get_upstream_name {
{ git ls-remote --exit-code upstream &>/dev/null || {
# try
git ls-remote --exit-code upstream 2>/dev/null && echo "upstream"
} || {
# catch
echo "origin" echo "origin"
return
} }
echo "upstream"
} }
function pull_latest_commit { function pull_latest_commit {
@ -43,6 +41,7 @@ function pull_latest_commit {
git pull $REMOTE_NAME $BRANCH_NAME; git pull $REMOTE_NAME $BRANCH_NAME;
echo "$SUBMODULE_NAME: Successfully pulled latest commit" echo "$SUBMODULE_NAME: Successfully pulled latest commit"
echo ""
} }
export -f pull_latest_commit export -f pull_latest_commit