Mihai Capotă <mihai@xxxxxxxxx> writes:
> 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ă <mihai@xxxxxxxxx>
> ---
> 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
It is good to see the patch being thorough, adjusting even
documentation.
> 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));
> }
This hunk makes me wonder if this s/kilobytes/kib/ is a good idea in
the first place. This in-tree user was lucky enough to have been
caught and adjusted, but we don't know how many out-of-tree scripts
are broken the same way and in need of a similar treatment.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html