Merge branch 'jk/show-branch-lift-name-len-limit'

diff --git a/t/t7810-grep.sh b/t/t7810-grep.sh
index c051c7ee80801670dd33c564e57f9b44621468d6..cee42097b077378f42910666a7895347b0787b1a 100755 (executable)
--- a/t/t7810-grep.sh
+++ b/t/t7810-grep.sh
@@ -1032,7 +1032,7 @@ test_expect_success 'grep --no-index pattern -- path' '
 
 test_expect_success 'grep --no-index complains of revs' '
        test_must_fail git grep --no-index o master -- 2>err &&
-       test_i18ngrep "no-index cannot be used with revs" err
+       test_i18ngrep "cannot be used with revs" err
 '
 
 test_expect_success 'grep --no-index prefers paths to revs' '
@@ -1043,6 +1043,11 @@ test_expect_success 'grep --no-index prefers paths to revs' '
        test_cmp expect actual
 '
 
+test_expect_success 'grep --no-index does not "diagnose" revs' '
+       test_must_fail git grep --no-index o :1:hello.c 2>err &&
+       test_i18ngrep ! -i "did you mean" err
+'
+
 cat >expected <<EOF
 hello.c:int main(int argc, const char **argv)
 hello.c:       printf("Hello world.\n");