aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2019-01-14 16:33:13 +0100
committerWladimir J. van der Laan <laanwj@gmail.com>2019-01-14 16:33:13 +0100
commita4c5bbfcd3a12f310b26cccc78ded32dd3f32ebb (patch)
tree82d01524f5c3a2437eb4b3f33f655f39c3842363
parent059a3cffdfa596aa3adaace3f57fa86fdd3f80fc (diff)
contrib: Add support for http[s] URLs in github-merge
Sometimes it can be useful to use github-merge with read-only access (say, for reviewing and testing).
-rwxr-xr-xcontrib/devtools/github-merge.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/contrib/devtools/github-merge.py b/contrib/devtools/github-merge.py
index 6712d4f3b6..bbebd11e8e 100755
--- a/contrib/devtools/github-merge.py
+++ b/contrib/devtools/github-merge.py
@@ -168,7 +168,10 @@ def main():
print("git config --global user.signingkey <key>",file=stderr)
sys.exit(1)
- host_repo = host+":"+repo # shortcut for push/pull target
+ if host.startswith(('https:','http:')):
+ host_repo = host+"/"+repo+".git"
+ else:
+ host_repo = host+":"+repo
# Extract settings from command line
args = parse_arguments()