[PATCH v3 4/4] count-objects: report how much disk space taken by garbage files

[Nguyễn Thái Ngọc Duy]

Also issue warnings on loose garbages instead of errors as a result of
using report_garbage() function in count_objects()

Signed-off-by: Nguyễn Thái Ngọc Duy <pclo...@gmail.com>
---
 Documentation/git-count-objects.txt |  2 ++
 builtin/count-objects.c             | 21 +++++++++++++--------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/Documentation/git-count-objects.txt 
b/Documentation/git-count-objects.txt
index 1611d7c..da6e72e 100644
--- a/Documentation/git-count-objects.txt
+++ b/Documentation/git-count-objects.txt
@@ -35,6 +35,8 @@ the packs. These objects could be pruned using `git 
prune-packed`.
 +
 garbage: the number of files in object database that are not valid
 loose objects nor valid packs
++
+size-garbage: disk space consumed by garbage files, in KiB
 
 GIT
 ---
diff --git a/builtin/count-objects.c b/builtin/count-objects.c
index 639c9a5..75feee5 100644
--- a/builtin/count-objects.c
+++ b/builtin/count-objects.c
@@ -10,12 +10,15 @@
 #include "parse-options.h"
 
 static unsigned long garbage;
+static off_t size_garbage;
 
 static void real_report_garbage(const char *desc,
                                const char *path, int len,
                                const char *name)
 {
        struct strbuf sb = STRBUF_INIT;
+       struct stat st;
+
        if (len && name)
                strbuf_addf(&sb, "%.*s/%s", len, path, name);
        else if (!len && name)
@@ -23,6 +26,10 @@ static void real_report_garbage(const char *desc,
        else
                strbuf_addf(&sb, "%s", path);
        warning("%s: %s", desc, sb.buf);
+
+       if (!stat(sb.buf, &st))
+               size_garbage += st.st_size;
+
        garbage++;
        strbuf_release(&sb);
 }
@@ -30,8 +37,7 @@ static void real_report_garbage(const char *desc,
 static void count_objects(DIR *d, char *path, int len, int verbose,
                          unsigned long *loose,
                          off_t *loose_size,
-                         unsigned long *packed_loose,
-                         unsigned long *garbage)
+                         unsigned long *packed_loose)
 {
        struct dirent *ent;
        while ((ent = readdir(d)) != NULL) {
@@ -63,11 +69,9 @@ static void count_objects(DIR *d, char *path, int len, int 
verbose,
                                (*loose_size) += xsize_t(on_disk_bytes(st));
                }
                if (bad) {
-                       if (verbose) {
-                               error("garbage found: %.*s/%s",
-                                     len + 2, path, ent->d_name);
-                               (*garbage)++;
-                       }
+                       if (verbose)
+                               report_garbage("garbage found",
+                                              path, len + 2, ent->d_name);
                        continue;
                }
                (*loose)++;
@@ -117,7 +121,7 @@ int cmd_count_objects(int argc, const char **argv, const 
char *prefix)
                if (!d)
                        continue;
                count_objects(d, path, len, verbose,
-                             &loose, &loose_size, &packed_loose, &garbage);
+                             &loose, &loose_size, &packed_loose);
                closedir(d);
        }
        if (verbose) {
@@ -142,6 +146,7 @@ int cmd_count_objects(int argc, const char **argv, const 
char *prefix)
                printf("size-pack: %lu\n", (unsigned long) (size_pack / 1024));
                printf("prune-packable: %lu\n", packed_loose);
                printf("garbage: %lu\n", garbage);
+               printf("size-garbage: %lu\n", (unsigned long) (size_garbage / 
1024));
        }
        else
                printf("%lu objects, %lu kilobytes\n",
-- 
1.8.1.2.536.gf441e6d

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html