Andrew's git / gitweb.git / diff
?
Make "git-send-pack" less verbose by default
authorLinus Torvalds <torvalds@osdl.org>
Wed, 21 Dec 2005 02:13:02 +0000 (18:13 -0800)
committerJunio C Hamano <junkio@cox.net>
Wed, 21 Dec 2005 05:18:32 +0000 (21:18 -0800)
It used to make sense to have git-send-pack talk about the things it sent
when (a) it was a new program and (b) nobody had a lot of tags and
branches.

These days, it's just distracting to see tons of

'refs/tags/xyz': up-to-date
...

when updating a remote repo.

So shut it up by default, and add a "--verbose" flag for those who really
want to see it.

Also, since this makes he case of everything being up-to-date just totally
silent, make it say "Everything up-to-date" if no refs needed updating.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
send-pack.c patch | blob | history
diff --git a/send-pack.c b/send-pack.c
index 6ce0d9f7884e34c9dc6c90f98bc9f7745c07e12a..a41bbe5ecfdff6fd7cea1bfc3d3415ba57867f2b 100644 (file)
--- a/send-pack.c
+++ b/send-pack.c
@@ -8,6 +8,7 @@ static const char send_pack_usage[] =
 "git-send-pack [--all] [--exec=git-receive-pack] <remote> [<head>...]\n"
 "  --all and explicit <head> specification are mutually exclusive.";
 static const char *exec = "git-receive-pack";
 "git-send-pack [--all] [--exec=git-receive-pack] <remote> [<head>...]\n"
 "  --all and explicit <head> specification are mutually exclusive.";
 static const char *exec = "git-receive-pack";
+static int verbose = 0;
 static int send_all = 0;
 static int force_update = 0;
 
 static int send_all = 0;
 static int force_update = 0;
 
@@ -206,7 +207,8 @@ static int send_pack(int in, int out, int nr_refspec, char **refspec)
                if (!ref->peer_ref)
                        continue;
                if (!memcmp(ref->old_sha1, ref->peer_ref->new_sha1, 20)) {
                if (!ref->peer_ref)
                        continue;
                if (!memcmp(ref->old_sha1, ref->peer_ref->new_sha1, 20)) {
-                       fprintf(stderr, "'%s': up-to-date\n", ref->name);
+                       if (verbose)
+                               fprintf(stderr, "'%s': up-to-date\n", ref->name);
                        continue;
                }
 
                        continue;
                }
 
@@ -270,6 +272,8 @@ static int send_pack(int in, int out, int nr_refspec, char **refspec)
        packet_flush(out);
        if (new_refs)
                pack_objects(out, remote_refs);
        packet_flush(out);
        if (new_refs)
                pack_objects(out, remote_refs);
+       else
+               fprintf(stderr, "Everything up-to-date\n");
        close(out);
        return ret;
 }
        close(out);
        return ret;
 }
@@ -301,6 +305,10 @@ int main(int argc, char **argv)
                                force_update = 1;
                                continue;
                        }
                                force_update = 1;
                                continue;
                        }
+                       if (!strcmp(arg, "--verbose")) {
+                               verbose = 1;
+                               continue;
+                       }
                        usage(send_pack_usage);
                }
                if (!dest) {
                        usage(send_pack_usage);
                }
                if (!dest) {