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