Re: [PATCH 1/1] Git.pm: add semicolon after catch statement
- From
Jeff King <peff@peff.net>
- Date
- Oct 16, 2022, 23:18 UTC
- Message-ID
- <Y0yRStZ6gM+H8/Bf@coredump.intra.peff.net>
- In-Reply-To
- <20221016212236.12453-2-michael@mcclimon.org>
On Sun, Oct 16, 2022 at 05:22:36PM -0400, Michael McClimon wrote:
Show 10 quoted lines
> When attempting to initialize a repository object in an unsafe > directory, a syntax error is reported (Can't use string as a HASH ref > while strict refs in use). Fix this runtime error by adding the required > semicolon after the catch statement. > > Without the semicolon, the result of the following line (i.e., the > result of Cwd::abs_path) is passed as the third argument to Error.pm's > catch function. That function expects that its third argument, > $clauses, is a hash reference, and trying to access a string as a hash > reference is a fatal error.
Curiously this works as expected for me, both before and after your patch. I wonder if it depends on perl version. Mine is 5.34.
I've never used Error.pm's try/catch before, so I don't know what's normal. Regular if/unless doesn't need it, but certainly an earlier catch uses a semicolon. So it seems like a reasonable fix.
Show 10 quoted lines
> diff --git a/perl/Git.pm b/perl/Git.pm
> index 080cdc2a..cf15ead6 100644
> --- a/perl/Git.pm
> +++ b/perl/Git.pm
> @@ -217,7 +217,7 @@ sub repository {
> } catch Git::Error::Command with {
> # Mimic git-rev-parse --git-dir error message:
> throw Error::Simple("fatal: Not a git repository: $dir");
> - }
> + };I'd assume t9700 passes for you, since I don't think we cover this case. Maybe it's worth squashing this in:
diff --git a/t/t9700/test.pl b/t/t9700/test.pl index e046f7db76..5bd3687f37 100755 --- a/t/t9700/test.pl +++ b/t/t9700/test.pl @@ -30,6 +30,12 @@ sub adjust_dirsep { # set up our $abs_repo_dir = cwd(); ok(our $r = Git->repository(Directory => "."), "open repository"); +{ + local $ENV{GIT_TEST_ASSUME_DIFFERENT_OWNER} = 1; + my $failed = eval { Git->repository(Directory => ".") }; + ok(!$failed, "reject unsafe repository"); + like($@, qr/not a git repository/i, "unsafe error message"); +} # config is($r->config("test.string"), "value", "config scalar: string");