MahnoKropotkinvich/redox
1
0
Fork 0
mirror of https://gitlab.redox-os.org/redox-os/redox.git synced 2026-07-07 03:58:41 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve fetch git branch logic

Browse Source
This commit is contained in:
Jeremy Soller 2019-09-15 14:50:08 -06:00
parent a27a641574
commit e1a5a2cc22
No known key found for this signature in database
GPG Key ID: E988B49EE78A7FB1
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cook.sh
View File

@ -119,14 +119,17 @@ function op {
git remote add upstream "$GIT_UPSTREAM" git remote add upstream "$GIT_UPSTREAM"
git fetch upstream git fetch upstream
fi fi
ORIGIN_BRANCH="$(git branch --remotes | grep '^ origin/HEAD -> ' | cut -d ' ' -f 5-)"
if [ -n "$BRANCH" ] if [ -n "$BRANCH" ]
then then
git checkout "$BRANCH" ORIGIN_BRANCH="origin/$BRANCH"
else fi
#TODO: Find correct upstream default branch
git checkout master if [ "$(git rev-parse HEAD)" != "$(git rev-parse $ORIGIN_BRANCH)" ]
then
git checkout -B "$(echo "$ORIGIN_BRANCH" | cut -d / -f 2-)" "$ORIGIN_BRANCH"
fi fi
git pull
git submodule sync --recursive git submodule sync --recursive
git submodule update --init --recursive git submodule update --init --recursive
popd > /dev/null popd > /dev/null