builtin-push: resurrect parsing of Push: lines

diff --git a/mktag.c b/mktag.c
index 97e270a5761f071aeb3666b595b5cd6a8cbd4098..23288781cf6caad62253130f75112e18eb4905aa 100644 (file)
--- a/mktag.c
+++ b/mktag.c
@@ -1,4 +1,5 @@
 #include "cache.h"
+#include "tag.h"
 
 /*
  * A signature file has a very simple fixed format: three lines
@@ -116,14 +117,9 @@ int main(int argc, char **argv)
        // Read the signature
        size = 0;
        for (;;) {
-               int ret = read(0, buffer + size, MAXSIZE - size);
-               if (!ret)
+               int ret = xread(0, buffer + size, MAXSIZE - size);
+               if (ret <= 0)
                        break;
-               if (ret < 0) {
-                       if (errno == EAGAIN)
-                               continue;
-                       break;
-               }
                size += ret;
        }
 
@@ -131,7 +127,7 @@ int main(int argc, char **argv)
        if (verify_tag(buffer, size) < 0)
                die("invalid tag signature file");
 
-       if (write_sha1_file(buffer, size, "tag", result_sha1) < 0)
+       if (write_sha1_file(buffer, size, tag_type, result_sha1) < 0)
                die("unable to write tag file");
        printf("%s\n", sha1_to_hex(result_sha1));
        return 0;