summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2021-02-09 15:11:05 -0700
committerSean Whitton <spwhitton@spwhitton.name>2021-02-09 15:11:05 -0700
commit271163c2b076caf31dd758b0d7a289362632f40a (patch)
tree45710b0d9ddbf2b4de9f0f11eb738685f89d2fbd
parent4ee50f13b849960dc3a9acbbeedb2fdd42af82c3 (diff)
parent8d6e6a5513a08a4394b024b8762c7fcebc1e08fd (diff)
downloadp5-API-GitForge-271163c2b076caf31dd758b0d7a289362632f40a.tar.gz
Merge tag 'v0.006' into debian
v0.006 # gpg: Signature made Tue 09 Feb 2021 03:10:47 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--Changes4
-rw-r--r--dist.ini2
-rw-r--r--lib/API/GitForge/Role/GitForge.pm4
3 files changed, 7 insertions, 3 deletions
diff --git a/Changes b/Changes
index 1fbbfea..e9a89a1 100644
--- a/Changes
+++ b/Changes
@@ -2,6 +2,10 @@ Revision history for API::GitForge
{{$NEXT}}
+0.006 2021-02-09 15:10:36-07:00 America/Phoenix
+ - API::GitForge::Role::GitForge::clean_fork(): fix checking the exit
+ status of the push of the gitforge branch.
+
0.005 2020-05-24 08:04:55-07:00 America/Phoenix
- API::GitForge::Role::GitForge::clean_repo(): don't continue if
fail to push the gitforge branch.
diff --git a/dist.ini b/dist.ini
index 3be89a7..eba853e 100644
--- a/dist.ini
+++ b/dist.ini
@@ -4,7 +4,7 @@ license = GPL_3
copyright_holder = Sean Whitton <spwhitton@spwhitton.name>
copyright_year = 2017, 2020
-version = 0.005
+version = 0.006
[PkgVersion]
[PodWeaver]
diff --git a/lib/API/GitForge/Role/GitForge.pm b/lib/API/GitForge/Role/GitForge.pm
index 1301f88..f0c616b 100644
--- a/lib/API/GitForge/Role/GitForge.pm
+++ b/lib/API/GitForge/Role/GitForge.pm
@@ -126,8 +126,8 @@ sub clean_fork {
# 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"
- or croak "failed to push the gitforge branch to $fork_uri";
+ system qw(git -C), $git->dir, "push", $fork_uri, "master:gitforge";
+ $! and croak "failed to push the gitforge branch to $fork_uri";
$self->_clean_config_fork($_[0]);