summaryrefslogtreecommitdiff
path: root/builtin-count-objects.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-12-30 09:24:12 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-12-30 09:24:12 (GMT)
commitb0b3a241e2ca1ba5b928a128b6dcafb990df6e75 (patch)
treef0631396a9ce6a1bdd3ef12f2c87cd47a7864cea /builtin-count-objects.c
parentf5e025a9d5b35e24768475f6890b836ce0d5ed15 (diff)
parent70d7099916c9621e157c620f9cc7fc982f109c55 (diff)
downloadgit-b0b3a241e2ca1ba5b928a128b6dcafb990df6e75.zip
git-b0b3a241e2ca1ba5b928a128b6dcafb990df6e75.tar.gz
git-b0b3a241e2ca1ba5b928a128b6dcafb990df6e75.tar.bz2
Merge branch 'maint-1.6.1' into maint
* maint-1.6.1: textconv: stop leaking file descriptors commit: --cleanup is a message option git count-objects: handle packs bigger than 4G t7102: make the test fail if one of its check fails Conflicts: builtin-commit.c diff.c
Diffstat (limited to 'builtin-count-objects.c')
-rw-r--r--builtin-count-objects.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/builtin-count-objects.c b/builtin-count-objects.c
index 1b0b6c8..2bdd8eb 100644
--- a/builtin-count-objects.c
+++ b/builtin-count-objects.c
@@ -11,7 +11,7 @@
static void count_objects(DIR *d, char *path, int len, int verbose,
unsigned long *loose,
- unsigned long *loose_size,
+ off_t *loose_size,
unsigned long *packed_loose,
unsigned long *garbage)
{
@@ -77,7 +77,7 @@ int cmd_count_objects(int argc, const char **argv, const char *prefix)
int len = strlen(objdir);
char *path = xmalloc(len + 50);
unsigned long loose = 0, packed = 0, packed_loose = 0, garbage = 0;
- unsigned long loose_size = 0;
+ off_t loose_size = 0;
struct option opts[] = {
OPT__VERBOSE(&verbose),
OPT_END(),
@@ -103,7 +103,7 @@ int cmd_count_objects(int argc, const char **argv, const char *prefix)
if (verbose) {
struct packed_git *p;
unsigned long num_pack = 0;
- unsigned long size_pack = 0;
+ off_t size_pack = 0;
if (!packed_git)
prepare_packed_git();
for (p = packed_git; p; p = p->next) {
@@ -116,15 +116,15 @@ int cmd_count_objects(int argc, const char **argv, const char *prefix)
num_pack++;
}
printf("count: %lu\n", loose);
- printf("size: %lu\n", loose_size / 1024);
+ printf("size: %lu\n", (unsigned long) (loose_size / 1024));
printf("in-pack: %lu\n", packed);
printf("packs: %lu\n", num_pack);
- printf("size-pack: %lu\n", size_pack / 1024);
+ printf("size-pack: %lu\n", (unsigned long) (size_pack / 1024));
printf("prune-packable: %lu\n", packed_loose);
printf("garbage: %lu\n", garbage);
}
else
printf("%lu objects, %lu kilobytes\n",
- loose, loose_size / 1024);
+ loose, (unsigned long) (loose_size / 1024));
return 0;
}