From b018ba7021fc4acd8534d9c4eba69da00a593853 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Wed, 30 Jan 2019 08:47:43 +0000 Subject: git: use "git rev-parse --git-path" Using git worktrees was causing t/solver_git.t to fail on me. --- lib/PublicInbox/SolverGit.pm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'lib/PublicInbox/SolverGit.pm') diff --git a/lib/PublicInbox/SolverGit.pm b/lib/PublicInbox/SolverGit.pm index d7875333..59d2c93c 100644 --- a/lib/PublicInbox/SolverGit.pm +++ b/lib/PublicInbox/SolverGit.pm @@ -272,8 +272,9 @@ EOF my $f = 'objects/info/alternates'; open $fh, '>', "$git_dir/$f" or die "open: $f: $!"; - print($fh (map { "$_->{git_dir}/objects\n" } @{$self->{gits}})) or - die "print $f: $!"; + foreach my $git (@{$self->{gits}}) { + print $fh $git->git_path('objects'),"\n" or die "print $f: $!"; + } close $fh or die "close: $f: $!"; my $tmp_git = $self->{tmp_git} = PublicInbox::Git->new($git_dir); $tmp_git->{-tmp} = $self->{tmp}; -- cgit v1.2.3-24-ge0c7