dumping ground for random patches and texts
 help / color / mirror / Atom feed
From: Eric Wong <e@80x24.org>
To: spew@80x24.org
Subject: [PATCH 03/10] admin: hoist out resolve_git_dir
Date: Thu, 16 Mar 2023 20:01:24 +0000	[thread overview]
Message-ID: <20230316200131.2113244-3-e@80x24.org> (raw)
In-Reply-To: <20230316200131.2113244-1-e@80x24.org>

We'll be using this for indexing git coderepos.
---
 lib/PublicInbox/Admin.pm | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/PublicInbox/Admin.pm b/lib/PublicInbox/Admin.pm
index 11ea8f83..a3b41d99 100644
--- a/lib/PublicInbox/Admin.pm
+++ b/lib/PublicInbox/Admin.pm
@@ -69,13 +69,19 @@ sub resolve_inboxdir {
 			die "`$try' is not a directory\n";
 		}
 	}
+	my $dir = resolve_git_dir($cd);
+	$$ver = 1 if $ver;
+	$dir;
+}
+
+sub resolve_git_dir {
+	my ($cd) = @_;
 	# try v1 bare git dirs
 	my $cmd = [ qw(git rev-parse --git-dir) ];
 	my $fh = popen_rd($cmd, undef, {-C => $cd});
 	my $dir = do { local $/; <$fh> };
-	close $fh or die "error in @$cmd (cwd:${\($cd // '.')}): $!\n";
+	close $fh or die "error in @$cmd (cwd:${\($cd // '.')}): $?\n";
 	chomp $dir;
-	$$ver = 1 if $ver;
 	rel2abs_collapsed($dir eq '.' ? ($cd // $dir) : $dir);
 }
 

  parent reply	other threads:[~2023-03-16 20:01 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-03-16 20:01 [PATCH 01/10] ipc: move nproc_shards from v2writable Eric Wong
2023-03-16 20:01 ` [PATCH 02/10] search: relocate all_terms from lei_search Eric Wong
2023-03-16 20:01 ` Eric Wong [this message]
2023-03-16 20:01 ` [PATCH 04/10] admin: ensure resolved GIT_DIR is absolute Eric Wong
2023-03-16 20:01 ` [PATCH 05/10] test_common: create_inbox: use `$!' properly on mkdir failure Eric Wong
2023-03-16 20:01 ` [PATCH 06/10] codesearch: initial cut w/ -cindex tool Eric Wong
2023-03-16 20:01 ` [PATCH 07/10] cindex: parallelize prep phases Eric Wong
2023-03-16 20:01 ` [PATCH 08/10] cindex: use read-only shards during " Eric Wong
2023-03-16 20:01 ` [PATCH 09/10] searchidxshard: improve comment wording Eric Wong
2023-03-16 20:01 ` [PATCH 10/10] cindex: use DS and workqueues for parallelism Eric Wong
  -- strict thread matches above, loose matches on Subject: below --
2023-03-15 10:10 [PATCH 01/10] ipc: move nproc_shards from v2writable Eric Wong
2023-03-15 10:10 ` [PATCH 03/10] admin: hoist out resolve_git_dir 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:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

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

  git send-email \
    --in-reply-to=20230316200131.2113244-3-e@80x24.org \
    --to=e@80x24.org \
    --cc=spew@80x24.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).