From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,AWL,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 6A8261F953 for ; Wed, 10 Nov 2021 02:39:00 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH] solver: support sha256 coderepos Date: Wed, 10 Nov 2021 02:39:00 +0000 Message-Id: <20211110023900.9273-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: Tested manually on a newish project I'm working on. --- lib/PublicInbox/Git.pm | 7 +++++++ lib/PublicInbox/SolverGit.pm | 11 +++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/lib/PublicInbox/Git.pm b/lib/PublicInbox/Git.pm index 309f80db..54ceaf0b 100644 --- a/lib/PublicInbox/Git.pm +++ b/lib/PublicInbox/Git.pm @@ -94,6 +94,13 @@ sub alternates_changed { $self->{alt_st} = $st; # always a true value } +sub object_format { + $_[0]->{object_format} //= do { + my $fmt = $_[0]->qx(qw(config extensions.objectformat)); + $fmt eq "sha256\n" ? \'sha256' : \undef; + } +} + sub last_check_err { my ($self) = @_; my $fh = $self->{err_c} or return; diff --git a/lib/PublicInbox/SolverGit.pm b/lib/PublicInbox/SolverGit.pm index 5d5060f4..62b5a343 100644 --- a/lib/PublicInbox/SolverGit.pm +++ b/lib/PublicInbox/SolverGit.pm @@ -293,14 +293,21 @@ sub do_git_init ($) { mkdir("$git_dir/$_") or die "mkdir $_: $!"; } open my $fh, '>', "$git_dir/config" or die "open git/config: $!"; - print $fh <<'EOF' or die "print git/config $!"; + my $first = $self->{gits}->[0]; + my $fmt = $first->object_format; + my $v = defined($$fmt) ? 1 : 0; + print $fh <', "$git_dir/HEAD" or die "open git/HEAD: $!";