update copyrights for 2021

[public-inbox.git] / lib / PublicInbox / Import.pm

diff --git a/lib/PublicInbox/Import.pm b/lib/PublicInbox/Import.pm
index 7258e84884a3b28337d271983d72bbabbeb1c9b3..47a529ff6767fee583af0138a907a0b4ca8343d5 100644 (file)
--- a/lib/PublicInbox/Import.pm
+++ b/lib/PublicInbox/Import.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2020 all contributors <meta@public-inbox.org>
+# Copyright (C) 2016-2021 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 #
 # git fast-import-based ssoma-mda MDA replacement
@@ -9,7 +9,7 @@ package PublicInbox::Import;
 use strict;
 use parent qw(PublicInbox::Lock);
 use v5.10.1;
-use PublicInbox::Spawn qw(spawn popen_rd);
+use PublicInbox::Spawn qw(run_die popen_rd);
 use PublicInbox::MID qw(mids mid2path);
 use PublicInbox::Address;
 use PublicInbox::Smsg;
@@ -442,13 +442,6 @@ sub add {
        $self->{tip} = ":$commit";
 }
 
-sub run_die ($;$$) {
-       my ($cmd, $env, $rdr) = @_;
-       my $pid = spawn($cmd, $env, $rdr);
-       waitpid($pid, 0) == $pid or die join(' ', @$cmd) .' did not finish';
-       $? == 0 or die join(' ', @$cmd) . " failed: $?\n";
-}
-
 my @INIT_FILES = ('HEAD' => undef, # filled in at runtime
                'description' => <<EOD,
 Unnamed repository; edit this file 'description' to name the repository.
@@ -463,16 +456,18 @@ EOD
 EOC
 
 sub init_bare {
-       my ($dir) = @_; # or self
+       my ($dir, $head) = @_; # or self
        $dir = $dir->{git}->{git_dir} if ref($dir);
        require File::Path;
        File::Path::mkpath([ map { "$dir/$_" } qw(objects/info refs/heads) ]);
        $INIT_FILES[1] //= 'ref: '.default_branch."\n";
-       for (my $i = 0; $i < @INIT_FILES; $i++) {
-               my $f = $dir.'/'.$INIT_FILES[$i++];
+       my @fn_contents = @INIT_FILES;
+       $fn_contents[1] = "ref: refs/heads/$head\n" if defined $head;
+       while (my ($fn, $contents) = splice(@fn_contents, 0, 2)) {
+               my $f = $dir.'/'.$fn;
                next if -f $f;
                open my $fh, '>', $f or die "open $f: $!";
-               print $fh $INIT_FILES[$i] or die "print $f: $!";
+               print $fh $contents or die "print $f: $!";
                close $fh or die "close $f: $!";
        }
 }