The code uses division by 1024. The master branch count-objects manual also
uses "KiB".
Also updated the code that reads count-objects output (t5301, t5700, t7408, and
git-cvsimport) and the Git User's Manual.
Signed-off-by: Mihai Capotă <mi...@mihaic.ro>
---
Documentation/user-manual.txt | 4 ++--
builtin/count-objects.c | 2 +-
git-cvsimport.perl | 8 ++++----
t/t5301-sliding-window.sh | 4 ++--
t/t5700-clone-reference.sh | 4 ++--
t/t7408-submodule-reference.sh | 4 ++--
6 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index e831cc2..b61a09c 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -3175,7 +3175,7 @@ lot of objects. Try this on an old project:
------------------------------------------------
$ git count-objects
-6930 objects, 47620 kilobytes
+6930 objects, 47620 KiB
------------------------------------------------
The first number is the number of objects which are kept in
@@ -3215,7 +3215,7 @@ You can verify that the loose objects are gone by looking
at the
------------------------------------------------
$ git count-objects
-0 objects, 0 kilobytes
+0 objects, 0 KiB
------------------------------------------------
Although the object files are gone, any commands that refer to those
diff --git a/builtin/count-objects.c b/builtin/count-objects.c
index 9afaa88..ecc13b0 100644
--- a/builtin/count-objects.c
+++ b/builtin/count-objects.c
@@ -124,7 +124,7 @@ int cmd_count_objects(int argc, const char **argv, const
char *prefix)
printf("garbage: %lu\n", garbage);
}
else
- printf("%lu objects, %lu kilobytes\n",
+ printf("%lu objects, %lu KiB\n",
loose, (unsigned long) (loose_size / 1024));
return 0;
}
diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index 73d367c..de44e33 100755
--- a/git-cvsimport.perl
+++ b/git-cvsimport.perl
@@ -1126,12 +1126,12 @@ unless ($opt_P) {
}
# The heuristic of repacking every 1024 commits can leave a
-# lot of unpacked data. If there is more than 1MB worth of
+# lot of unpacked data. If there is more than 1MiB worth of
# not-packed objects, repack once more.
my $line = `git count-objects`;
-if ($line =~ /^(\d+) objects, (\d+) kilobytes$/) {
- my ($n_objects, $kb) = ($1, $2);
- 1024 < $kb
+if ($line =~ /^(\d+) objects, (\d+) KiB$/) {
+ my ($n_objects, $kib) = ($1, $2);
+ 1024 < $kib
and system(qw(git repack -a -d));
}
diff --git a/t/t5301-sliding-window.sh b/t/t5301-sliding-window.sh
index 2fc5af6..37931d2 100755
--- a/t/t5301-sliding-window.sh
+++ b/t/t5301-sliding-window.sh
@@ -20,7 +20,7 @@ test_expect_success \
commit1=`git commit-tree $tree </dev/null` &&
git update-ref HEAD $commit1 &&
git repack -a -d &&
- test "`git count-objects`" = "0 objects, 0 kilobytes" &&
+ test "`git count-objects`" = "0 objects, 0 KiB" &&
pack1=`ls .git/objects/pack/*.pack` &&
test -f "$pack1"'
@@ -46,7 +46,7 @@ test_expect_success \
commit2=`git commit-tree $tree -p $commit1 </dev/null` &&
git update-ref HEAD $commit2 &&
git repack -a -d &&
- test "`git count-objects`" = "0 objects, 0 kilobytes" &&
+ test "`git count-objects`" = "0 objects, 0 KiB" &&
pack2=`ls .git/objects/pack/*.pack` &&
test -f "$pack2" &&
test "$pack1" \!= "$pack2"'
diff --git a/t/t5700-clone-reference.sh b/t/t5700-clone-reference.sh
index c47d450..e5cfd6a 100755
--- a/t/t5700-clone-reference.sh
+++ b/t/t5700-clone-reference.sh
@@ -46,7 +46,7 @@ cd "$base_dir"
test_expect_success 'that reference gets used' \
'cd C &&
-echo "0 objects, 0 kilobytes" > expected &&
+echo "0 objects, 0 KiB" > expected &&
git count-objects > current &&
test_cmp expected current'
@@ -73,7 +73,7 @@ test_expect_success 'pulling from reference' \
cd "$base_dir"
test_expect_success 'that reference gets used' \
-'cd D && echo "0 objects, 0 kilobytes" > expected &&
+'cd D && echo "0 objects, 0 KiB" > expected &&
git count-objects > current &&
test_cmp expected current'
diff --git a/t/t7408-submodule-reference.sh b/t/t7408-submodule-reference.sh
index b770b2f..aeface6 100755
--- a/t/t7408-submodule-reference.sh
+++ b/t/t7408-submodule-reference.sh
@@ -49,7 +49,7 @@ cd "$base_dir"
test_expect_success 'that reference gets used with add' \
'cd super/sub &&
-echo "0 objects, 0 kilobytes" > expected &&
+echo "0 objects, 0 KiB" > expected &&
git count-objects > current &&
diff expected current'
@@ -72,7 +72,7 @@ cd "$base_dir"
test_expect_success 'that reference gets used with update' \
'cd super-clone/sub &&
-echo "0 objects, 0 kilobytes" > expected &&
+echo "0 objects, 0 KiB" > expected &&
git count-objects > current &&
diff expected current'
--
1.7.9.5
--
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
