strepsirrhini/libreoffice-online
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

./g review: don't assume that local and tracked branch is the same

Browse source 
E.g. local branch is OK to be 'co-4-2' while it tracks
origin/distro/collabora/co-4-2.

Previously this was only working when the local branch was not renamed.

Change-Id: I11c24d71e903d27d34ec498604190d6b436b593d
This commit is contained in:
Miklos Vajna 2020-10-14 08:42:36 +02:00
parent dfd51b19e0
commit a1ff7a7fee
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
g
View file

@ -16,15 +16,19 @@ if [ "$1" == "review" ]; then
exit 1
fi
# e.g. co-4-2
BRANCH=$(git symbolic-ref HEAD|sed 's|refs/heads/||')
REMOTE_BRANCH=private/$USER/$BRANCH
# e.g. origin
REMOTE=$(git config branch.$BRANCH.remote)
# e.g. distro/collabora/co-4-2
TRACKED_BRANCH=$(git rev-parse --abbrev-ref --symbolic-full-name HEAD@{upstream}|sed "s|${REMOTE}/||")
REMOTE_BRANCH=private/$USER/$TRACKED_BRANCH
CUSTOM_BRANCH=
if [ -n "$2" ]; then
REMOTE_BRANCH=private/$USER/$2
CUSTOM_BRANCH=y
fi
HAS_REMOTE_BRANCH=
REMOTE=$(git config branch.$BRANCH.remote)
if git rev-parse --quiet --verify $REMOTE/$REMOTE_BRANCH >/dev/null; then
HAS_REMOTE_BRANCH=y
fi
@ -39,7 +43,7 @@ if [ "$1" == "review" ]; then
# Open a new PR.
git push $REMOTE HEAD:$REMOTE_BRANCH
git branch $REMOTE_BRANCH
gh pr create --base $BRANCH --head $REMOTE_BRANCH --fill
gh pr create --base $TRACKED_BRANCH --head $REMOTE_BRANCH --fill
git branch -D $REMOTE_BRANCH
fi
exit 0