git-svn: avoid warning on undef readline()

avar · gitster · commit 51db27158765 · 2018-04-09T11:11:13.000+09:00
Change code in Git.pm that sometimes calls chomp() on undef to only do so the value is defined. This code has been chomping undef values ever since it was added in b26098f ("git-svn: reduce scope of input record separator change", 2016-10-14), but started warning due to the introduction of "use warnings" to Git.pm in my f0e19cb ("Git.pm: add the "use warnings" pragma", 2018-02-25) released with 2.17.0. Since this function will return undef in those cases it's still possible that the code using it will warn if it does a chomp of its own, as the code added in b26098f ("git-svn: reduce scope of input record separator change", 2016-10-14) might do, but since git-svn has "use warnings" already that's clearly not a codepath that's going to warn. See https://public-inbox.org/git/86h8oobl36.fsf@phe.ftfl.ca/ for the original report. Reported-by: Joseph Mingrone <jrm@ftfl.ca> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Improved-by: Eric Wong <e@80x24.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff --git a/perl/Git.pm b/perl/Git.pm
@@ -549,7 +549,7 @@ sub get_record {
 	my ($fh, $rs) = @_;
 	local $/ = $rs;
 	my $rec = <$fh>;
-	chomp $rec if defined $rs;
+	chomp $rec if defined $rec;
 	$rec;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -549,7 +549,7 @@ sub get_record {`
`549`	`549`	`my ($fh, $rs) = @_;`
`550`	`550`	`local $/ = $rs;`
`551`	`551`	`my $rec = <$fh>;`
`552`		`- chomp $rec if defined $rs;`
	`552`	`+ chomp $rec if defined $rec;`
`553`	`553`	`$rec;`
`554`	`554`	`}`
`555`	`555`