Merge branch 'jk/parseopt-usage-msg-opt' into maint

diff --git a/t/t2203-add-intent.sh b/t/t2203-add-intent.sh
index 8652a96d86b85f02d6c07a210ac60fa122dc1649..84a9028c433c02c72adcdf06222bcb409e2eb683 100755 (executable)
--- a/t/t2203-add-intent.sh
+++ b/t/t2203-add-intent.sh
@@ -129,6 +129,16 @@ 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 &&
+       (
+               cd empty-intial-commit &&
+               : >one &&
+               git add -N one &&
+               test_must_fail git commit -m nothing-new-here
+       )
+'
+
 test_expect_success 'commit: ita entries ignored in empty commit check' '
        git init empty-subsequent-commit &&
        (