From: Matthias Urlichs <smurf@smurf.noris.de>
Date: Mon, 10 Oct 2005 10:45:46 +0000 (+0200)
Subject: svn import: fixed two pipe open calls.
X-Git-Tag: v0.99.9~112^2~19
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6d281217b930466717d0078285e5431c409b7aec;p=git.git

svn import: fixed two pipe open calls.

Perl's magic "different semantics of open() based on the number of
arguments" is really annoying at times...

Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>
---

diff --git a/git-svnimport.perl b/git-svnimport.perl
index 3844cc50d..415b50b35 100755
--- a/git-svnimport.perl
+++ b/git-svnimport.perl
@@ -290,7 +290,7 @@ sub get_file($$$) {
 	my ($name, $res) = eval { $svn->file($svnpath,$rev); };
 	return () unless defined $name;
 
-	open my $F, '-|', "git-hash-object -w $name"
+	open my $F, '-|', "git-hash-object", "-w", $name
 		or die "Cannot create object: $!\n";
 	my $sha = <$F>;
 	chomp $sha;
@@ -437,14 +437,14 @@ sub commit {
 	}
 
 	if(@old) {
-		open F, "-│", "git-ls-files", "-z", @old or die $!;
+		open my $F, "-│", "git-ls-files", "-z", @old or die $!;
 		@old = ();
 		local $/ = '\0';
-		while(<F>) {
+		while(<$F>) {
 			chomp;
 			push(@old,$_);
 		}
-		close(F);
+		close($F);
 
 		while(@old) {
 			my @o2;