Merge branch 'jk/ident-ai-canonname-could-be-null' into maint

diff --git a/t/t7810-grep.sh b/t/t7810-grep.sh
index cf3f9ec63187f17cbfab40aaa3d514e281004275..de2405ccba29016d2b83e16482bcfcbe70429e46 100755 (executable)
--- a/t/t7810-grep.sh
+++ b/t/t7810-grep.sh
@@ -581,7 +581,7 @@ test_expect_success 'log grep (9)' '
 '
 
 test_expect_success 'log grep (9)' '
-       git log -g --grep-reflog="commit: third" --author="non-existant" --pretty=tformat:%s >actual &&
+       git log -g --grep-reflog="commit: third" --author="non-existent" --pretty=tformat:%s >actual &&
        : >expect &&
        test_cmp expect actual
 '