summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@gmx.de>2020-06-25 17:58:15 +0200
committerOswald Buddenhagen <oswald.buddenhagen@gmx.de>2020-06-26 10:54:08 +0000
commit169c46dcb39eaf3e48e29e30e712e039cc84e2e7 (patch)
tree8497d457aed8ac1e4a98e93bba497ba08fa5db8e /bin
parent243f72afcec864103c93e2ac4b5ee1abbfabc45e (diff)
downloadqtrepotools-169c46dcb39eaf3e48e29e30e712e039cc84e2e7.tar.gz
gpush/gpick: add support for remote.*.pushUrl
in principle, a user could use pushUrl instead of a separate gerrit remote. this is mostly hypothetical, as the Qt mirrors are only partial, while this would work only with a full mirror, as gpick fetches patchsets from gerrit (where pushUrl is obviously ignored). Change-Id: I52287f1ce72b058672dd320e97455aee572d01f1 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'bin')
-rw-r--r--bin/git_gpush.pm3
1 files changed, 2 insertions, 1 deletions
diff --git a/bin/git_gpush.pm b/bin/git_gpush.pm
index ce1a106..65515bb 100644
--- a/bin/git_gpush.pm
+++ b/bin/git_gpush.pm
@@ -2104,7 +2104,8 @@ sub set_gerrit_config($)
{
my ($rmt) = @_;
- my $url = git_config('remote.'.$rmt.'.url');
+ my $url = git_config('remote.'.$rmt.'.pushurl');
+ $url = git_config('remote.'.$rmt.'.url') if (!$url);
fail("Remote '$rmt' does not exist.\n") if (!$url);
if ($url =~ m,^ssh://([^/:]+)(?::(\d+))?/(.*?)(?:\.git)?/?$,) {
push @gerrit_ssh, '-p', $2 if (defined($2));