Skip to content

Commit 63c657b

Browse files
author
Paul Yang
committed
Support HTTPS repo address in ghmerge script
Reviewed-by: Tim Hudson <[email protected]> Reviewed-by: Tomas Mraz <[email protected]> (Merged from #224)
1 parent 4bd102c commit 63c657b

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

review-tools/ghmerge

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ else
144144
fi
145145
ADDREVOPTS=${ADDREVOPTS# } # chop any leading ' '
146146

147-
[ "$REMOTE" = "" ] && REMOTE=`git remote -v | awk /$REMOTESRVR':(openssl|omc|otc).*(push)/{ print $1; }' | head -n 1` # usually this will be 'upstream'
147+
[ "$REMOTE" = "" ] && REMOTE=`git remote -v | awk /$REMOTESRVR'(:|\/)(openssl|omc|otc).*(push)/{ print $1; }' | head -n 1` # usually this will be 'upstream'
148148
if [ "$REMOTE" = "" ] ; then
149149
echo Cannot find git remote with URL including "$REMOTESRVR"
150150
exit 1

0 commit comments

Comments
 (0)