git-apply: parse the diff headers (both traditional and new)

[git.git] / rpull.c

diff --git a/rpull.c b/rpull.c
index 75f8f94fcfbb122b76435ddb1c68f805dee55b7e..36e49f799a6ac300a00f8d09d9dc9e6636b3d8e0 100644 (file)
--- a/rpull.c
+++ b/rpull.c
@@ -1,11 +1,5 @@
-#include <fcntl.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
 #include "cache.h"
 #include "commit.h"
-#include <errno.h>
-#include <stdio.h>
 #include "rsh.h"
 #include "pull.h"
 
@@ -14,8 +8,12 @@ static int fd_out;
 
 int fetch(unsigned char *sha1)
 {
+       int ret;
        write(fd_out, sha1, 20);
-       return write_sha1_from_fd(sha1, fd_in);
+       ret = write_sha1_from_fd(sha1, fd_in);
+       if (!ret)
+               pull_say("got %s\n", sha1_to_hex(sha1));
+       return ret;
 }
 
 int main(int argc, char **argv)
@@ -33,11 +31,13 @@ int main(int argc, char **argv)
                        get_all = 1;
                        get_tree = 1;
                        get_history = 1;
+               } else if (argv[arg][1] == 'v') {
+                       get_verbosely = 1;
                }
                arg++;
        }
        if (argc < arg + 2) {
-               usage("rpull [-c] [-t] [-a] commit-id url");
+               usage("git-rpull [-c] [-t] [-a] [-v] commit-id url");
                return 1;
        }
        commit_id = argv[arg];