From ea4e9025dd14f251996baf724e04fc478375b6a2 Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Wed, 7 Apr 2021 19:05:24 -0400 Subject: import: convert init.defaultBranch to fully qualified ref init.defaultBranch expects a branch name, not a fully qualified ref. git-init prepends "refs/heads/" automatically and unconditionally. PublicInbox::Import::default_branch, however, incorrectly passes on the init.defaultBranch value as is, leading to it being used in spots where a fully qualified ref is required. For example, with an init.defaultBranch value of "master", public-inbox-index for a v2 repository would lead to an all.git repository where HEAD's content is "ref: master" instead of "ref: refs/heads/master". Prepend "refs/heads/" to the incoming init.defaultBranch value. Fixes: 7c2f36de2fb49dd7 (import: respect init.defaultBranch) --- lib/PublicInbox/Import.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/PublicInbox/Import.pm b/lib/PublicInbox/Import.pm index 46f57e27..3adf9dec 100644 --- a/lib/PublicInbox/Import.pm +++ b/lib/PublicInbox/Import.pm @@ -25,7 +25,7 @@ sub default_branch () { { GIT_CONFIG => undef }); chomp(my $h = <$r> // ''); close $r; - $h eq '' ? 'refs/heads/master' : $h; + $h eq '' ? 'refs/heads/master' : "refs/heads/$h"; } } -- cgit v1.2.3-24-ge0c7