From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 26 Jul 2015 18:48:55 +0000 (+0100)
Subject: rpush: Support empty files in protocol_read_bytes
X-Git-Tag: debian/1.1~38
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=08246013777e261333f6f972554bc02ae17bc60a

rpush: Support empty files in protocol_read_bytes
---

diff --git a/dgit b/dgit
index 8a546101..d5aa3871 100755
--- a/dgit
+++ b/dgit
@@ -273,7 +273,7 @@ sub protocol_send_file ($$) {
 
 sub protocol_read_bytes ($$) {
     my ($fh, $nbytes) = @_;
-    $nbytes =~ m/^[1-9]\d{0,5}$/ or badproto \*RO, "bad byte count";
+    $nbytes =~ m/^[1-9]\d{0,5}$|^0$/ or badproto \*RO, "bad byte count";
     my $d;
     my $got = read $fh, $d, $nbytes;
     $got==$nbytes or badproto_badread $fh, "data block";