user/dev discussion of public-inbox itself
 help / color / mirror / code / Atom feed
From: Kyle Meyer <>
Subject: [PATCH] import: convert init.defaultBranch to fully qualified ref
Date: Wed, 07 Apr 2021 19:05:24 -0400	[thread overview]
Message-ID: <> (raw)

Recently I've tried lei on another machine and scratched my head for a
bit about why the local storage seemed to be in a corrupt state.  With
`lei q', no mail was getting imported, and I saw a good number of
"fatal: not a git repository: ..." messages.

It turns out that HEAD's content is invalid, and that's happening
because PublicInbox::Import mishandles init.defaultBranch, which I've
configured on that machine to suppress the associated `git init' hint.

-- >8 --
Subject: [PATCH] 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/ | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/PublicInbox/ b/lib/PublicInbox/
index 46f57e27..3adf9dec 100644
--- a/lib/PublicInbox/
+++ b/lib/PublicInbox/
@@ -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";

base-commit: 86c2ebf085cc9897bafcb95b82890f2645f515e5

             reply	other threads:[~2021-04-07 23:05 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-07 23:05 Kyle Meyer [this message]
2021-04-07 23:27 ` Eric Wong

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:

  List information:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \
    --subject='Re: [PATCH] import: convert init.defaultBranch to fully qualified ref' \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

user/dev discussion of public-inbox itself

This inbox may be cloned and mirrored by anyone:

	git clone --mirror
	git clone --mirror http://czquwvybam4bgbro.onion/meta
	git clone --mirror http://hjrcffqmbrq6wope.onion/meta
	git clone --mirror http://ou63pmih66umazou.onion/meta

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V1 meta meta/ \
	public-inbox-index meta

Example config snippet for mirrors.
Newsgroups are available over NNTP:
 note: .onion URLs require Tor:

code repositories for project(s) associated with this inbox:

AGPL code for this site: git clone