Merge branch 'dn/test-reject-utf-16'

diff --git a/t/t4211-line-log.sh b/t/t4211-line-log.sh
index 00a850d61166aae6caaa61385b826cba73519b90..7665d6785c1a91ed0171e8cac61174ebee9b9a37 100755 (executable)
--- a/t/t4211-line-log.sh
+++ b/t/t4211-line-log.sh
@@ -68,7 +68,6 @@ test_bad_opts "-L :foo:b.c" "no match"
 # thus to demonstrate this particular bug, the empty -L range must follow a
 # non-empty -L range.
 test_expect_success '-L {empty-range} (any -L)' '
-       n=$(expr $(cat b.c | wc -l) + 1) &&
        n=$(expr $(wc -l <b.c) + 1) &&
        git log -L1,1:b.c -L$n:b.c
 '