From 6d6a64af884f34084058be0d3631a4d11dbb9565 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Tue, 10 Mar 2020 09:34:36 -0700 Subject: drop whitespace before semicolon Signed-off-by: Sean Whitton --- lib/App/git/nuke_forge_fork.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; -- cgit v1.2.3 From a596c254eb30247335258d432fa052b1bbe5cfae Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Fri, 13 Mar 2020 17:27:24 -0700 Subject: reinstate workaround for pushing the gitforge branch Signed-off-by: Sean Whitton --- Changes | 3 +++ lib/API/GitForge/Role/GitForge.pm | 10 +++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Changes b/Changes index cc506c8..20e82f4 100644 --- a/Changes +++ b/Changes @@ -1,6 +1,9 @@ Revision history for API::GitForge {{$NEXT}} + - 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 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 -- cgit v1.2.3 From da10efe98ac76f05c0aa6c8510aa0d2aad52f61a Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Fri, 13 Mar 2020 17:27:55 -0700 Subject: bump version Signed-off-by: Sean Whitton --- dist.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist.ini b/dist.ini index 5ae0ca9..7dccb21 100644 --- a/dist.ini +++ b/dist.ini @@ -4,7 +4,7 @@ license = GPL_3 copyright_holder = Sean Whitton copyright_year = 2017, 2020 -version = 0.003 +version = 0.004 [PkgVersion] [PodWeaver] -- cgit v1.2.3 From 17371df88fa9c03eb5257e4e24d7e0d1a6b46b7c Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Fri, 13 Mar 2020 17:28:15 -0700 Subject: v0.004 - API::GitForge::Role::GitForge::clean_repo(): reinstate workaround -- bypass Git::Wrapper when pushing the gitforge branch. Signed-off-by: Sean Whitton --- Changes | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Changes b/Changes index 20e82f4..f678f79 100644 --- a/Changes +++ b/Changes @@ -1,6 +1,8 @@ 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. -- cgit v1.2.3