summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Urlichs <smurf@smurf.noris.de>2005-10-10 10:45:46 (GMT)
committerMatthias Urlichs <smurf@smurf.noris.de>2005-10-10 10:45:46 (GMT)
commit6d281217b930466717d0078285e5431c409b7aec (patch)
tree4d61621c4875ffbf709b6c20355cb9fdb895c82f
parentf0daa628a297819ed039e6b61d337fde02d8a6dd (diff)
downloadgit-6d281217b930466717d0078285e5431c409b7aec.zip
git-6d281217b930466717d0078285e5431c409b7aec.tar.gz
git-6d281217b930466717d0078285e5431c409b7aec.tar.bz2
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>
-rwxr-xr-xgit-svnimport.perl8
1 files changed, 4 insertions, 4 deletions
diff --git a/git-svnimport.perl b/git-svnimport.perl
index 3844cc5..415b50b 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;