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

diff --git a/t/t4062-diff-pickaxe.sh b/t/t4062-diff-pickaxe.sh
index 5929f2eabb966305a4b0bb6ec6b1d4d9a4e9efe2..f0bf50bda780f04f9f2ffc2c1f39e354f69ae193 100755 (executable)
--- a/t/t4062-diff-pickaxe.sh
+++ b/t/t4062-diff-pickaxe.sh
@@ -14,7 +14,7 @@ test_expect_success setup '
        test_tick &&
        git commit -m "A 4k file"
 '
-test_expect_failure '-G matches' '
+test_expect_success '-G matches' '
        git diff --name-only -G "^0{4096}$" HEAD^ >out &&
        test 4096-zeroes.txt = "$(cat out)"
 '