git-svn: do not let Git.pm warn if we prematurely close pipes

Eric Wong · Junio C Hamano · commit 22600a2515cc · 2007-02-01T21:51:36.000-08:00
This mainly quiets down warnings when running git svn log.

Signed-off-by: Eric Wong &lt;normalperson@yhbt.net&gt;
Signed-off-by: Junio C Hamano &lt;junkio@cox.net&gt;
diff --git a/git-svn.perl b/git-svn.perl
@@ -681,7 +681,7 @@ sub show_log {
 		process_commit($_, $r_min, $r_max) foreach reverse @k;
 	}
 out:
-	eval { command_close_pipe($log) };
+	close $log;
 	print '-' x72,"\n" unless $_incremental || $_oneline;
 }
 
@@ -1475,7 +1475,7 @@ sub map_tree_joins {
 				$seen{$commit} = 1;
 			}
 		}
-		eval { command_close_pipe($pipe) };
+		close $pipe;
 	}
 }
 
@@ -1669,7 +1669,7 @@ sub write_grafts {
 				last unless /^\S/;
 			}
 		}
-		eval { command_close_pipe($ch) }; # breaking the pipe
+		close $ch; # breaking the pipe
 
 		# if real parents are the only ones in the grafts, drop it
 		next if join(' ',sort keys %$p) eq join(' ',sort keys %x);
@@ -1766,7 +1766,7 @@ sub get_commit_time {
 		} elsif ($tz =~ s/^\-//) {
 			$s -= tz_to_s_offset($tz);
 		}
-		eval { command_close_pipe($fh) };
+		close $fh;
 		return $s;
 	}
 	die "Can't get commit time for commit: $cmt\n";
@@ -2846,7 +2846,7 @@ sub rmdirs {
 			delete $rm->{join '/', @dn};
 		}
 		unless (%$rm) {
-			eval { command_close_pipe($fh) };
+			close $fh;
 			return;
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -681,7 +681,7 @@ sub show_log {`
`681`	`681`	`process_commit($_, $r_min, $r_max) foreach reverse @k;`
`682`	`682`	`}`
`683`	`683`	`out:`
`684`		`- eval { command_close_pipe($log) };`
	`684`	`+ close $log;`
`685`	`685`	`print '-' x72,"\n" unless $_incremental \|\| $_oneline;`
`686`	`686`	`}`
`687`	`687`
`@@ -1475,7 +1475,7 @@ sub map_tree_joins {`
`1475`	`1475`	`$seen{$commit} = 1;`
`1476`	`1476`	`}`
`1477`	`1477`	`}`
`1478`		`- eval { command_close_pipe($pipe) };`
	`1478`	`+ close $pipe;`
`1479`	`1479`	`}`
`1480`	`1480`	`}`
`1481`	`1481`
`@@ -1669,7 +1669,7 @@ sub write_grafts {`
`1669`	`1669`	`last unless /^\S/;`
`1670`	`1670`	`}`
`1671`	`1671`	`}`
`1672`		`- eval { command_close_pipe($ch) }; # breaking the pipe`
	`1672`	`+ close $ch; # breaking the pipe`
`1673`	`1673`
`1674`	`1674`	`# if real parents are the only ones in the grafts, drop it`
`1675`	`1675`	`next if join(' ',sort keys %$p) eq join(' ',sort keys %x);`
`@@ -1766,7 +1766,7 @@ sub get_commit_time {`
`1766`	`1766`	`} elsif ($tz =~ s/^\-//) {`
`1767`	`1767`	`$s -= tz_to_s_offset($tz);`
`1768`	`1768`	`}`
`1769`		`- eval { command_close_pipe($fh) };`
	`1769`	`+ close $fh;`
`1770`	`1770`	`return $s;`
`1771`	`1771`	`}`
`1772`	`1772`	`die "Can't get commit time for commit: $cmt\n";`
`@@ -2846,7 +2846,7 @@ sub rmdirs {`
`2846`	`2846`	`delete $rm->{join '/', @dn};`
`2847`	`2847`	`}`
`2848`	`2848`	`unless (%$rm) {`
`2849`		`- eval { command_close_pipe($fh) };`
	`2849`	`+ close $fh;`
`2850`	`2850`	`return;`
`2851`	`2851`	`}`
`2852`	`2852`	`}`