Merge branch 'jk/trailers-parse' into next

diff --git a/t/t2203-add-intent.sh b/t/t2203-add-intent.sh
index 84a9028c433c02c72adcdf06222bcb409e2eb683..1bdf38e80dbe5322fc239371eb71b146a40586e0 100755 (executable)
--- a/t/t2203-add-intent.sh
+++ b/t/t2203-add-intent.sh
@@ -129,10 +129,10 @@ test_expect_success 'cache-tree does skip dir that becomes empty' '
        )
 '
 
-test_expect_success 'commit: ita entries ignored in empty intial commit check' '
-       git init empty-intial-commit &&
+test_expect_success 'commit: ita entries ignored in empty initial commit check' '
+       git init empty-initial-commit &&
        (
-               cd empty-intial-commit &&
+               cd empty-initial-commit &&
                : >one &&
                git add -N one &&
                test_must_fail git commit -m nothing-new-here