Merge branch 'maint-1.6.0' into maint-1.6.1

diff --git a/t/t2203-add-intent.sh b/t/t2203-add-intent.sh
index d4de35ea067c4a7c3a9a46ceac57f4cf1086a19a..58a329961e5c269e1b035558db890c9e30375147 100755 (executable)
--- a/t/t2203-add-intent.sh
+++ b/t/t2203-add-intent.sh
@@ -32,5 +32,33 @@ test_expect_success 'intent to add does not clobber existing paths' '
        ! grep "$empty" actual
 '
 
+test_expect_success 'cannot commit with i-t-a entry' '
+       test_tick &&
+       git commit -a -m initial &&
+       git reset --hard &&
+
+       echo xyzzy >rezrov &&
+       echo frotz >nitfol &&
+       git add rezrov &&
+       git add -N nitfol &&
+       test_must_fail git commit
+'
+
+test_expect_success 'can commit with an unrelated i-t-a entry in index' '
+       git reset --hard &&
+       echo xyzzy >rezrov &&
+       echo frotz >nitfol &&
+       git add rezrov &&
+       git add -N nitfol &&
+       git commit -m partial rezrov
+'
+
+test_expect_success 'can "commit -a" with an i-t-a entry' '
+       git reset --hard &&
+       : >nitfol &&
+       git add -N nitfol &&
+       git commit -a -m all
+'
+
 test_done