Merge branch 'ar/chmod-series' into next

diff --git a/clone-pack.c b/clone-pack.c
index 03dbc2ead6ebadf7f45b7f368cb0666f9bd767a5..a4370f595f1206840e66d488423f1c7e42029c6d 100644 (file)
--- a/clone-pack.c
+++ b/clone-pack.c
@@ -6,6 +6,8 @@ static const char clone_pack_usage[] =
 "git-clone-pack [--exec=<git-upload-pack>] [<host>:]<directory> [<heads>]*";
 static const char *exec = "git-upload-pack";
 
+static int quiet = 0;
+
 static void clone_handshake(int fd[2], struct ref *ref)
 {
        unsigned char sha1[20];
@@ -123,7 +125,9 @@ static int clone_pack(int fd[2], int nr_match, char **match)
        }
        clone_handshake(fd, refs);
 
-       status = receive_keep_pack(fd, "git-clone-pack");
+       status = receive_keep_pack(fd, "git-clone-pack", quiet);
+       if (!quiet)
+               fprintf(stderr, "\n");
 
        if (!status) {
                if (nr_match == 0)
@@ -154,14 +158,14 @@ int main(int argc, char **argv)
                char *arg = argv[i];
 
                if (*arg == '-') {
-                       if (!strcmp("-q", arg))
+                       if (!strcmp("-q", arg)) {
+                               quiet = 1;
                                continue;
+                       }
                        if (!strncmp("--exec=", arg, 7)) {
                                exec = arg + 7;
                                continue;
                        }
-                       if (!strcmp("--keep", arg))
-                               continue;
                        usage(clone_pack_usage);
                }
                dest = arg;