Sync with 2.10.1

diff --git a/t/t1006-cat-file.sh b/t/t1006-cat-file.sh
index 4f38078ff36f5a877defc360feaf6fdba804ccc1..b19f3326946203409fe0e428b9fc73d34134d756 100755 (executable)
--- a/t/t1006-cat-file.sh
+++ b/t/t1006-cat-file.sh
@@ -231,7 +231,7 @@ $tag_content
        | git cat-file --batch)"
 '
 
-test_expect_success "--batch-check for an emtpy line" '
+test_expect_success "--batch-check for an empty line" '
     test " missing" = "$(echo | git cat-file --batch-check)"
 '