From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 22 Oct 2013 14:11:05 +0000 (+0100)
Subject: fix protocol_receive_file not to use STDIN
X-Git-Tag: debian/0.17_experimental1~8
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=8922b4bef17886da65d1ac33eede20ade9fa4197

fix protocol_receive_file not to use STDIN
---

diff --git a/debian/changelog b/debian/changelog
index 8c37c8fe..1dfefb33 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ dgit (0.17) unstable; urgency=low
 
   * Fix dgit --damp-run sbuild to actually work.
   * Improvements to implementation of --dry-run and --damp-run.
+  * More fixes to remote implementation.
 
  --
 
diff --git a/dgit b/dgit
index b1ed9044..549b2515 100755
--- a/dgit
+++ b/dgit
@@ -223,9 +223,9 @@ sub protocol_receive_file ($$) {
 	my ($y,$l) = protocol_expect {
 	    m/^data-block (.*})$|data-end$/;
 	    length $1 ? (1,$1) : (0);
-	} \*STDIN;
+	} $fh;
 	last unless $y;
-	my $d = protocol_read_bytes \*STDIN, $1;
+	my $d = protocol_read_bytes $fh, $1;
 	print PF $d or die $!;
     }
     printdebug "received into $ourfn\n";