@matheusbsbs / matheus-bagliano / commits / b60daf0515
Fork 0

Make git-prune-packed a bit more chatty.

Steven Grimm noticed that git-repack's verbosity is inconsistent because pack-objects is chatty and prune-packed is not. This makes the latter a bit more chatty and gives -q option to squelch it. Signed-off-by: Junio C Hamano <junkio@cox.net>

Junio C Hamano committed Jan 12, 2007 at 15:00 UTC b60daf0515889ca75f88f1d4d49a6a9c4117ba36
3 files changed +22 -9
Documentation/git-prune-packed.txt
+4 -1
@@ -9,7 +9,7 @@ residing in a pack file.
9
10 SYNOPSIS
11 --------
12 -'git-prune-packed' [-n]
12 +'git-prune-packed' [-n] [-q]
13
14
15 DESCRIPTION
@@ -32,6 +32,9 @@ OPTIONS
32 Don't actually remove any objects, only show those that would have been
33 removed.
34
35 +-q::
36 + Squelch the progress indicator.
37 +
38 Author
39 ------
40 Written by Linus Torvalds <torvalds@osdl.org>
builtin-prune-packed.c
+17 -7
@@ -4,7 +4,10 @@
4 static const char prune_packed_usage[] =
5 "git-prune-packed [-n]";
6
7 -static void prune_dir(int i, DIR *dir, char *pathname, int len, int dryrun)
7 +#define DRY_RUN 01
8 +#define VERBOSE 02
9 +
10 +static void prune_dir(int i, DIR *dir, char *pathname, int len, int opts)
11 {
12 struct dirent *de;
13 char hex[40];
@@ -20,7 +23,7 @@ static void prune_dir(int i, DIR *dir, char *pathname, int len, int dryrun)
23 if (!has_sha1_pack(sha1, NULL))
24 continue;
25 memcpy(pathname + len, de->d_name, 38);
23 - if (dryrun)
26 + if (opts & DRY_RUN)
27 printf("rm -f %s\n", pathname);
28 else if (unlink(pathname) < 0)
29 error("unable to unlink %s", pathname);
@@ -29,7 +32,7 @@ static void prune_dir(int i, DIR *dir, char *pathname, int len, int dryrun)
32 rmdir(pathname);
33 }
34
32 -void prune_packed_objects(int dryrun)
35 +void prune_packed_objects(int opts)
36 {
37 int i;
38 static char pathname[PATH_MAX];
@@ -46,24 +49,31 @@ void prune_packed_objects(int dryrun)
49
50 sprintf(pathname + len, "%02x/", i);
51 d = opendir(pathname);
52 + if (opts == VERBOSE && (d || i == 255))
53 + fprintf(stderr, "Removing unused objects %d%%...\015",
54 + ((i+1) * 100) / 256);
55 if (!d)
56 continue;
51 - prune_dir(i, d, pathname, len + 3, dryrun);
57 + prune_dir(i, d, pathname, len + 3, opts);
58 closedir(d);
59 }
60 + if (opts == VERBOSE)
61 + fprintf(stderr, "\nDone.\n");
62 }
63
64 int cmd_prune_packed(int argc, const char **argv, const char *prefix)
65 {
66 int i;
59 - int dryrun = 0;
67 + int opts = VERBOSE;
68
69 for (i = 1; i < argc; i++) {
70 const char *arg = argv[i];
71
72 if (*arg == '-') {
73 if (!strcmp(arg, "-n"))
66 - dryrun = 1;
74 + opts |= DRY_RUN;
75 + else if (!strcmp(arg, "-q"))
76 + opts &= ~VERBOSE;
77 else
78 usage(prune_packed_usage);
79 continue;
@@ -72,6 +82,6 @@ int cmd_prune_packed(int argc, const char **argv, const char *prefix)
82 usage(prune_packed_usage);
83 }
84 sync();
75 - prune_packed_objects(dryrun);
85 + prune_packed_objects(opts);
86 return 0;
87 }
git-repack.sh
+1 -1
@@ -110,7 +110,7 @@ then
110 done
111 )
112 fi
113 - git-prune-packed
113 + git-prune-packed $quiet
114 fi
115
116 case "$no_update_info" in