aboutsummaryrefslogtreecommitdiffhomepage
path: root/dev/tools
diff options
context:
space:
mode:
authorGravatar Théo Zimmermann <theo.zimmermann@univ-paris-diderot.fr>2018-03-28 16:56:37 +0200
committerGravatar Théo Zimmermann <theo.zimmermann@univ-paris-diderot.fr>2018-04-08 20:34:47 +0200
commit7d3e3f0aa5aea66a5e3c884eb0642a317d762051 (patch)
treeb7e235f4cb232d6e32e969f2753f7f50753a3255 /dev/tools
parent2feb32e1c4329520fa80a3a54f8986d6978ae444 (diff)
Merge script: use fetch URL for the remote.
In case the push URL has been overriden to make it fetch-only.
Diffstat (limited to 'dev/tools')
-rwxr-xr-xdev/tools/merge-pr.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/dev/tools/merge-pr.sh b/dev/tools/merge-pr.sh
index 20612eeb8..aa83c626e 100755
--- a/dev/tools/merge-pr.sh
+++ b/dev/tools/merge-pr.sh
@@ -79,7 +79,7 @@ if [ -z "$REMOTE" ]; then
error "please run: git branch --set-upstream-to=THE_REMOTE/$CURRENT_LOCAL_BRANCH"
exit 1
fi
-REMOTE_URL=$(git remote get-url "$REMOTE" --push)
+REMOTE_URL=$(git remote get-url "$REMOTE" --all)
if [ "$REMOTE_URL" != "$OFFICIAL_REMOTE_URL" ] && \
[ "$REMOTE_URL" != "$OFFICIAL_REMOTE_URL.git" ]; then
error "remote ${BLUE}$REMOTE${RESET} does not point to the official Coq repo"