From d7f85ee273e546f9cd822aa631d52e2f7a594e16 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Wed, 16 Dec 2020 23:19:05 +0000 Subject: inboxwritable: drop git_dir_n sub There's only one caller, unlikely to be any more, and should be harmless to open code. --- lib/PublicInbox/InboxWritable.pm | 3 --- lib/PublicInbox/V2Writable.pm | 3 ++- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/PublicInbox/InboxWritable.pm b/lib/PublicInbox/InboxWritable.pm index 48d2267f..c0e88f3d 100644 --- a/lib/PublicInbox/InboxWritable.pm +++ b/lib/PublicInbox/InboxWritable.pm @@ -300,9 +300,6 @@ sub warn_ignore_cb { } } -# v2+ only -sub git_dir_n { "$_[0]->{inboxdir}/git/$_[1].git" } - # v2+ only, XXX: maybe we can just rely on ->max_git_epoch and remove sub git_dir_latest { my ($self, $max) = @_; diff --git a/lib/PublicInbox/V2Writable.pm b/lib/PublicInbox/V2Writable.pm index 7b8b5abf..3e3b275f 100644 --- a/lib/PublicInbox/V2Writable.pm +++ b/lib/PublicInbox/V2Writable.pm @@ -1091,8 +1091,9 @@ sub sync_prepare ($$) { if ($sync->{max_size} = $sync->{-opt}->{max_size}) { $sync->{index_oid} = $self->can('index_oid'); } + my $git_pfx = "$sync->{ibx}->{inboxdir}/git"; for (my $i = $sync->{epoch_max}; $i >= 0; $i--) { - my $git_dir = $sync->{ibx}->git_dir_n($i); + my $git_dir = "$git_pfx/$i.git"; -d $git_dir or next; # missing epochs are fine my $git = PublicInbox::Git->new($git_dir); my $unit = { git => $git, epoch => $i }; -- cgit v1.2.3-24-ge0c7