From: Eric Wong <e@80x24.org>
To: spew@80x24.org
Subject: [PATCH 04/10] admin: ensure resolved GIT_DIR is absolute
Date: Wed, 15 Mar 2023 10:10:59 +0000 [thread overview]
Message-ID: <20230315101105.3651530-4-e@80x24.org> (raw)
In-Reply-To: <20230315101105.3651530-1-e@80x24.org>
We'll also support the $base arg of File::Spec->rel2abs
since it should make codesearch indexing easier.
---
lib/PublicInbox/Admin.pm | 4 +++-
lib/PublicInbox/Config.pm | 2 +-
script/public-inbox-convert | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/lib/PublicInbox/Admin.pm b/lib/PublicInbox/Admin.pm
index a3b41d99..53566dc6 100644
--- a/lib/PublicInbox/Admin.pm
+++ b/lib/PublicInbox/Admin.pm
@@ -82,7 +82,9 @@ sub resolve_git_dir {
my $dir = do { local $/; <$fh> };
close $fh or die "error in @$cmd (cwd:${\($cd // '.')}): $?\n";
chomp $dir;
- rel2abs_collapsed($dir eq '.' ? ($cd // $dir) : $dir);
+ # --absolute-git-dir requires git v2.13.0+
+ $dir = rel2abs_collapsed($dir, $cd) if $dir !~ m!\A/!;
+ $dir;
}
# for unconfigured inboxes
diff --git a/lib/PublicInbox/Config.pm b/lib/PublicInbox/Config.pm
index cdf06d85..905e632c 100644
--- a/lib/PublicInbox/Config.pm
+++ b/lib/PublicInbox/Config.pm
@@ -369,7 +369,7 @@ sub git_bool {
# is sufficient and doesn't leave "/.." or "/../"
sub rel2abs_collapsed {
require File::Spec;
- my $p = File::Spec->rel2abs($_[-1]);
+ my $p = File::Spec->rel2abs(@_);
return $p if substr($p, -3, 3) ne '/..' && index($p, '/../') < 0;
require Cwd;
Cwd::abs_path($p);
diff --git a/script/public-inbox-convert b/script/public-inbox-convert
index 42955a48..5f4f2020 100755
--- a/script/public-inbox-convert
+++ b/script/public-inbox-convert
@@ -75,7 +75,7 @@ if ($opt->{'index'}) {
}
local %ENV = (%$env, %ENV) if $env;
my $new = { %$old };
-$new->{inboxdir} = $cfg->rel2abs_collapsed($new_dir);
+$new->{inboxdir} = PublicInbox::Config::rel2abs_collapsed($new_dir);
$new->{version} = 2;
$new = PublicInbox::InboxWritable->new($new, { nproc => $opt->{jobs} });
$new->{-no_fsync} = 1 if !$opt->{fsync};
next prev parent reply other threads:[~2023-03-15 10:11 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-15 10:10 [PATCH 01/10] ipc: move nproc_shards from v2writable Eric Wong
2023-03-15 10:10 ` [PATCH 02/10] search: relocate all_terms from lei_search Eric Wong
2023-03-15 10:10 ` [PATCH 03/10] admin: hoist out resolve_git_dir Eric Wong
2023-03-15 10:10 ` Eric Wong [this message]
2023-03-15 10:11 ` [PATCH 05/10] test_common: create_inbox: use `$!' properly on mkdir failure Eric Wong
2023-03-15 10:11 ` [PATCH 06/10] codesearch: initial cut w/ -cindex tool Eric Wong
2023-03-15 10:11 ` [PATCH 07/10] cindex: parallelize prep phases Eric Wong
2023-03-15 10:11 ` [PATCH 08/10] cindex: use read-only shards during " Eric Wong
2023-03-15 10:11 ` [PATCH 09/10] search_idx_shard: Eric Wong
2023-03-15 10:11 ` [PATCH 10/10] cindex: read-only xdb shards fixup Eric Wong
-- strict thread matches above, loose matches on Subject: below --
2023-03-16 20:01 [PATCH 01/10] ipc: move nproc_shards from v2writable Eric Wong
2023-03-16 20:01 ` [PATCH 04/10] admin: ensure resolved GIT_DIR is absolute 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=20230315101105.3651530-4-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).