From d55abcc42bde846d9047491125dd2b32645dafd8 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Sun, 19 Apr 2020 23:19:34 +0000 Subject: import: init_bare: allow use as method, use in tests Allowing ->init_bare to be used as a method saves some keystrokes, and we can save a little bit of time on systems with our vfork(2)-enabled spawn(). This also sets us up for future improvements where we can avoid spawning a process at all. --- lib/PublicInbox/Import.pm | 3 ++- lib/PublicInbox/V2Writable.pm | 5 ++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/PublicInbox/Import.pm b/lib/PublicInbox/Import.pm index c72c1e92..351bc660 100644 --- a/lib/PublicInbox/Import.pm +++ b/lib/PublicInbox/Import.pm @@ -441,7 +441,8 @@ sub run_die ($;$$) { } sub init_bare { - my ($dir) = @_; + my ($dir) = @_; # or self + $dir = $dir->{git}->{git_dir} if ref($dir); my @cmd = (qw(git init --bare -q), $dir); run_die(\@cmd); # set a reasonable default: diff --git a/lib/PublicInbox/V2Writable.pm b/lib/PublicInbox/V2Writable.pm index 1c78ef24..ca5f4f1b 100644 --- a/lib/PublicInbox/V2Writable.pm +++ b/lib/PublicInbox/V2Writable.pm @@ -730,9 +730,8 @@ sub fill_alternates ($$) { sub git_init { my ($self, $epoch) = @_; my $git_dir = "$self->{-inbox}->{inboxdir}/git/$epoch.git"; - my @cmd = (qw(git init --bare -q), $git_dir); - PublicInbox::Import::run_die(\@cmd); - @cmd = (qw/git config/, "--file=$git_dir/config", + PublicInbox::Import::init_bare($git_dir); + my @cmd = (qw/git config/, "--file=$git_dir/config", 'include.path', '../../all.git/config'); PublicInbox::Import::run_die(\@cmd); fill_alternates($self, $epoch); -- cgit v1.2.3-24-ge0c7