blame: fix indent of line numbers

Correct the calculation of the number of digits for line counts of the
form 10^n-1 (9, 99, ...) in lineno_width().  This makes blame stop
printing an extra space before the line numbers of files with that many
total lines.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin-blame.c b/builtin-blame.c
index 10f7eacf6e881cdb54a6b4a4c0aafc5f9751e5a9..fc1586350f94ae48e7e48a51818517b465e7a40d 100644 (file)
--- a/builtin-blame.c
+++ b/builtin-blame.c
@@ -1772,7 +1772,7 @@ static int lineno_width(int lines)
 {
        int i, width;
 
 {
        int i, width;
 

-       for (width = 1, i = 10; i <= lines + 1; width++)
+       for (width = 1, i = 10; i <= lines; width++)

                i *= 10;
        return width;
 }
                i *= 10;
        return width;
 }

diff --git a/t/t8003-blame.sh b/t/t8003-blame.sh
index 3bbddd03cbfcf5cbdff6ed2987d68da9402ed993..230143cf318705fb01e61f10072a096e86186934 100755 (executable)
--- a/t/t8003-blame.sh
+++ b/t/t8003-blame.sh
@@ -11,7 +11,15 @@ test_expect_success setup '
        echo B B B B B >two &&
        echo C C C C C >tres &&
        echo ABC >mouse &&
        echo B B B B B >two &&
        echo C C C C C >tres &&
        echo ABC >mouse &&

-       git add one two tres mouse &&
+       for i in 1 2 3 4 5 6 7 8 9
+       do
+               echo $i
+       done >nine_lines &&
+       for i in 1 2 3 4 5 6 7 8 9 a
+       do
+               echo $i
+       done >ten_lines &&
+       git add one two tres mouse nine_lines ten_lines &&

        test_tick &&
        GIT_AUTHOR_NAME=Initial git commit -m Initial &&
 
        test_tick &&
        GIT_AUTHOR_NAME=Initial git commit -m Initial &&
 


@@ -167,4 +175,14 @@ test_expect_success 'blame -L with invalid end' '
        grep "has only 2 lines" errors
 '
 
        grep "has only 2 lines" errors
 '
 

+test_expect_success 'indent of line numbers, nine lines' '
+       git blame nine_lines >actual &&
+       test $(grep -c "  " actual) = 0
+'
+
+test_expect_success 'indent of line numbers, ten lines' '
+       git blame ten_lines >actual &&
+       test $(grep -c "  " actual) = 9
+'
+

 test_done
 test_done