diff options
author | Eric Wong <e@80x24.org> | 2021-02-09 07:09:30 -0100 |
---|---|---|
committer | Eric Wong <e@80x24.org> | 2021-02-10 06:59:03 +0000 |
commit | c57dc1468102aab386ed5dd3ae03d37f5b793aaa (patch) | |
tree | 3483c4127a34b498c003629f659d8ecb6a37ccfd | |
parent | a4dd78f9ff4613f41ae19e0f03584b5f561c0ac1 (diff) | |
download | public-inbox-c57dc1468102aab386ed5dd3ae03d37f5b793aaa.tar.gz |
git: ->qx: respect caller's $/ in array context
This could lead to bad results when doing ls-tree -z for v2 import in case there's multiple files. In any case, the `local $/ = "\0"' in Import.pm is also eliminated to reduce potential confusion and surprises.
-rw-r--r-- | lib/PublicInbox/Git.pm | 1 | ||||
-rw-r--r-- | lib/PublicInbox/Import.pm | 6 |
2 files changed, 2 insertions, 5 deletions
diff --git a/lib/PublicInbox/Git.pm b/lib/PublicInbox/Git.pm index ac7ff267..e176921c 100644 --- a/lib/PublicInbox/Git.pm +++ b/lib/PublicInbox/Git.pm @@ -364,7 +364,6 @@ sub popen { sub qx { my $fh = popen(@_); if (wantarray) { - local $/ = "\n"; my @ret = <$fh>; close $fh; # caller should check $? @ret; diff --git a/lib/PublicInbox/Import.pm b/lib/PublicInbox/Import.pm index a070aa1e..e803ee74 100644 --- a/lib/PublicInbox/Import.pm +++ b/lib/PublicInbox/Import.pm @@ -68,11 +68,9 @@ sub gfi_start { chomp($self->{tip} = $git->qx(qw(rev-parse --revs-only), $ref)); die "fatal: rev-parse --revs-only $ref: \$?=$?" if $?; if ($self->{path_type} ne '2/38' && $self->{tip}) { - local $/ = "\0"; - my @t = $git->qx(qw(ls-tree -r -z --name-only), $ref); + my $t = $git->qx(qw(ls-tree -r -z --name-only), $ref); die "fatal: ls-tree -r -z --name-only $ref: \$?=$?" if $?; - chomp @t; - $self->{-tree} = { map { $_ => 1 } @t }; + $self->{-tree} = { map { $_ => 1 } split(/\0/, $t) }; } $in_r = $self->{in} = $git->popen(qw(fast-import --quiet --done --date-format=raw), |