diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2020-03-13 17:28:38 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2020-03-13 17:28:38 -0700 |
| commit | 03476a917c5e952679c2fdb5f1145cbe112ef12c (patch) | |
| tree | 41599ad1106ee744d722e577d515210628e9990c | |
| parent | 3709d024dd9874f332aa3bd5b76de0833a8e9214 (diff) | |
| parent | 17371df88fa9c03eb5257e4e24d7e0d1a6b46b7c (diff) | |
| download | p5-API-GitForge-03476a917c5e952679c2fdb5f1145cbe112ef12c.tar.gz | |
Merge tag 'v0.004' into debian
v0.004
# gpg: Signature made Fri 13 Mar 2020 05:28:15 PM MST
# gpg: using RSA key 9B917007AE030E36E4FC248B695B7AE4BF066240
# gpg: issuer "spwhitton@spwhitton.name"
# gpg: Good signature from "Sean Whitton <spwhitton@spwhitton.name>" [ultimate]
# Primary key fingerprint: 8DC2 487E 51AB DD90 B5C4 753F 0F56 D055 3B6D 411B
# Subkey fingerprint: 9B91 7007 AE03 0E36 E4FC 248B 695B 7AE4 BF06 6240
| -rw-r--r-- | Changes | 5 | ||||
| -rw-r--r-- | dist.ini | 2 | ||||
| -rw-r--r-- | lib/API/GitForge/Role/GitForge.pm | 10 | ||||
| -rw-r--r-- | lib/App/git/nuke_forge_fork.pm | 2 |
4 files changed, 16 insertions, 3 deletions
@@ -2,6 +2,11 @@ Revision history for API::GitForge {{$NEXT}} +0.004 2020-03-13 17:28:05-07:00 America/Phoenix + - API::GitForge::Role::GitForge::clean_repo(): reinstate + workaround -- bypass Git::Wrapper when pushing the gitforge + branch. + 0.003 2020-03-10 09:21:28-07:00 America/Phoenix - API::GitForge::GitLab::_ensure_repo(): avoid an unnecessary API call. @@ -4,7 +4,7 @@ license = GPL_3 copyright_holder = Sean Whitton <spwhitton@spwhitton.name> copyright_year = 2017, 2020 -version = 0.003 +version = 0.004 [PkgVersion] [PodWeaver] diff --git a/lib/API/GitForge/Role/GitForge.pm b/lib/API/GitForge/Role/GitForge.pm index 52760ff..953eb91 100644 --- a/lib/API/GitForge/Role/GitForge.pm +++ b/lib/API/GitForge/Role/GitForge.pm @@ -119,7 +119,15 @@ sub clean_fork { $git->add("README.md"); $git->commit({ message => "Temporary fork for pull request(s)" }); - $git->push($fork_uri, "master:gitforge"); + # We should be able to just say + # + # $git->push($fork_uri, "master:gitforge"); + # + # but that hangs indefinitely when pushing to (at least) Debian's + # GitLab instance. So just bypass Git::Wrapper and do the push + # ourselves for now + system qw(git -C), $git->dir, "push", $fork_uri, "master:gitforge"; + $self->_clean_config_fork($_[0]); # assume that if we had to create the gitforge branch, we just diff --git a/lib/App/git/nuke_forge_fork.pm b/lib/App/git/nuke_forge_fork.pm index 773d863..8505da9 100644 --- a/lib/App/git/nuke_forge_fork.pm +++ b/lib/App/git/nuke_forge_fork.pm @@ -69,7 +69,7 @@ sub main { exit unless $term->ask_yn(prompt => "Are you sure?"); } - my ($forge_domain, $upstream_repo) = remote_forge_info $upstream ; + my ($forge_domain, $upstream_repo) = remote_forge_info $upstream; my $forge = new_from_domain domain => $forge_domain, access_token => forge_access_token $forge_domain; |