haraldwolff
/
collabora-online
mirror of https://github.com/CollaboraOnline/online.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

g review: fix advice on how to update the existing PR ... 

In case the local branch name and the remote branch name is different.

E.g. if you had co-6-4 tracking origin/distro/collabora/co-6-4, then the
correct advice is './g review distro/collabora/co-6-4', not './g review
co-6-4'.

Signed-off-by: Miklos Vajna <vmiklos@collabora.com>
Change-Id: I6b5556f992e30756542ed8e1f1cc15e61ce9bffa
pull/1051/head
Miklos Vajna 2020-12-18 17:36:55 +01:00
parent cac2b2c990
commit b47a4e7f53
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
g
View File

@ -49,7 +49,9 @@ if [ "$1" == "review" ]; then
fi
if [ -n "$HAS_REMOTE_BRANCH" ] && [ -z "$CUSTOM_BRANCH" ]; then
echo "Error: default remote branch would be '$REMOTE_BRANCH', but it already exists."
echo "To update the existing PR: type './g review $BRANCH' explicitly."
# Use $TRACKED_BRANCH, because we push to $REMOTE_BRANCH, which derives from
# $TRACKED_BRANCH, not $BRANCH.
echo "To update the existing PR: type './g review $TRACKED_BRANCH' explicitly."
exit 1
elif [ -n "$HAS_REMOTE_BRANCH" ] && [ -n "$CUSTOM_BRANCH" ]; then
# PR is open, same branch is explicitly specified, just update it.