[PATCH] Documentation: describe short-hand used in fetch/pull.

diff --git a/fetch-pack.c b/fetch-pack.c
index ec5bad89cdb3f6eae038877856f2eefb1125bf6f..9b1bc52244b390e3b046ae5e4b7889f8936a5510 100644 (file)
--- a/fetch-pack.c
+++ b/fetch-pack.c
@@ -3,7 +3,8 @@
 #include "pkt-line.h"
 #include <sys/wait.h>
 
-static const char fetch_pack_usage[] = "git-fetch-pack [host:]directory [heads]* < mycommitlist";
+static int quiet;
+static const char fetch_pack_usage[] = "git-fetch-pack [-q] [--exec=upload-pack] [host:]directory [heads]* < mycommitlist";
 static const char *exec = "git-upload-pack";
 
 static int find_common(int fd[2], unsigned char *result_sha1, unsigned char *remote)
@@ -68,7 +69,7 @@ static int get_remote_heads(int fd, int nr_match, char **match, unsigned char *r
                if (line[len-1] == '\n')
                        line[--len] = 0;
                if (len < 42 || get_sha1_hex(line, sha1))
-                       die("git-fetch-pack: protocol error - expected ref descriptor, got '%s¤'", line);
+                       die("git-fetch-pack: protocol error - expected ref descriptor, got '%s'", line);
                refname = line+41;
                if (nr_match && !path_match(refname, nr_match, match))
                        continue;
@@ -95,10 +96,11 @@ static int fetch_pack(int fd[2], int nr_match, char **match)
        if (pid < 0)
                die("git-fetch-pack: unable to fork off git-unpack-objects");
        if (!pid) {
-               close(fd[1]);
                dup2(fd[0], 0);
                close(fd[0]);
-               execlp("git-unpack-objects", "git-unpack-objects", NULL);
+               close(fd[1]);
+               execlp("git-unpack-objects", "git-unpack-objects",
+                      quiet ? "-q" : NULL, NULL);
                die("git-unpack-objects exec failed");
        }
        close(fd[0]);
@@ -134,7 +136,10 @@ int main(int argc, char **argv)
                char *arg = argv[i];
 
                if (*arg == '-') {
-                       /* Arguments go here */
+                       if (!strncmp("--exec=", arg, 7)) {
+                               exec = arg + 7;
+                               continue;
+                       }
                        usage(fetch_pack_usage);
                }
                dest = arg;