Merge branch 'maint-1.6.5' into maint

diff --git a/t/t8003-blame.sh b/t/t8003-blame.sh
index 13c25f1d528ca1ec90575e42e0393accff5d8f35..4a8db74f7e09a143e73d647479ef62af91547865 100755 (executable)
--- a/t/t8003-blame.sh
+++ b/t/t8003-blame.sh
@@ -144,4 +144,25 @@ test_expect_success 'blame path that used to be a directory' '
        git blame HEAD^.. -- path
 '
 
+test_expect_success 'blame to a commit with no author name' '
+  TREE=`git rev-parse HEAD:`
+  cat >badcommit <<EOF
+tree $TREE
+author <noname> 1234567890 +0000
+committer David Reiss <dreiss@facebook.com> 1234567890 +0000
+
+some message
+EOF
+  COMMIT=`git hash-object -t commit -w badcommit`
+  git --no-pager blame $COMMIT -- uno >/dev/null
+'
+
+test_expect_success 'blame -L with invalid start' '
+       test_must_fail git blame -L5 tres 2>&1 | grep "has only 2 lines"
+'
+
+test_expect_success 'blame -L with invalid end' '
+       git blame -L1,5 tres 2>&1 | grep "has only 2 lines"
+'
+
 test_done