user/dev discussion of public-inbox itself
 help / color / mirror / code / Atom feed
From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 3/7] v2writable: ->purge returns undef on no-op
Date: Fri, 11 Jan 2019 04:10:04 +0000	[thread overview]
Message-ID: <20190111041008.24361-4-e@80x24.org> (raw)
In-Reply-To: <20190111041008.24361-1-e@80x24.org>

And doesn't try to access undef as an array ref.
---
 lib/PublicInbox/V2Writable.pm | 2 +-
 t/v2writable.t                | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/PublicInbox/V2Writable.pm b/lib/PublicInbox/V2Writable.pm
index 222df5c..08d18fc 100644
--- a/lib/PublicInbox/V2Writable.pm
+++ b/lib/PublicInbox/V2Writable.pm
@@ -390,7 +390,7 @@ sub purge {
 	my ($self, $mime) = @_;
 	my $purges = $self->{-inbox}->with_umask(sub {
 		remove_internal($self, $mime, undef, {});
-	});
+	}) or return;
 	$self->idx_init if @$purges; # ->done is called on purges
 	for my $i (0..$#$purges) {
 		defined(my $cmt = $purges->[$i]) or next;
diff --git a/t/v2writable.t b/t/v2writable.t
index ec9f56d..f171417 100644
--- a/t/v2writable.t
+++ b/t/v2writable.t
@@ -247,6 +247,9 @@ EOF
 	ok(my $cmts = $im->purge($mime), 'purged message');
 	like($cmts->[0], qr/\A[a-f0-9]{40}\z/, 'purge returned current commit');
 	$im->done;
+
+	# again
+	is($im->purge($mime), undef, 'no-op returns undef');
 }
 
 {
-- 
EW


  parent reply	other threads:[~2019-01-11  4:10 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-01-11  4:10 [PATCH 0/7] implement purge tool Eric Wong
2019-01-11  4:10 ` [PATCH 1/7] hoist out resolve_repo_dir from -index Eric Wong
2019-01-11  4:10 ` [PATCH 2/7] import: purge: reap fast-export process Eric Wong
2019-01-11  4:10 ` Eric Wong [this message]
2019-01-11  4:10 ` [PATCH 4/7] v2writable: purge ignores non-existent git epoch directories Eric Wong
2019-01-11  4:10 ` [PATCH 5/7] v2writable: cleanup processes when done Eric Wong
2019-01-11  4:10 ` [PATCH 6/7] v2writable: read epoch on purge Eric Wong
2019-01-11  4:10 ` [PATCH 7/7] implement public-inbox-purge tool Eric Wong

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://public-inbox.org/README

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190111041008.24361-4-e@80x24.org \
    --to=e@80x24.org \
    --cc=meta@public-inbox.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/public-inbox.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).