From: Eric Wong <normalperson@yhbt.net>
Date: Thu, 1 Feb 2007 21:12:26 +0000 (-0800)
Subject: git-svn: do not let Git.pm warn if we prematurely close pipes
X-Git-Tag: v1.5.0-rc4~82
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=22600a2515cc92f66fd76f2aae05637697c713b9;p=git.git

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

This mainly quiets down warnings when running git svn log.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/git-svn.perl b/git-svn.perl
index 68156fc8a..8ebaae9ff 100755
--- 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;
 		}
 	}