Merge branch 'jc/maint-commit-ignore-i-t-a' into maint

* jc/maint-commit-ignore-i-t-a:
  commit: ignore intent-to-add entries instead of refusing

Conflicts:
	cache-tree.c

diff --cc cache-tree.c
index 8de39590d57e14d08ee4d04b74965191aa905b29,ce0d0e3ecc899817315f34f3c8908e0a34bf2266..bf03cb7fcefdc7e119203f096b367592d5b7cf8c
--- 1/cache-tree.c
--- 2/cache-tree.c
+++ b/cache-tree.c
@@@ -158,9 -158,7 +158,9 @@@ static int verify_cache(struct cache_en
        funny = 0;
        for (i = 0; i < entries; i++) {
                struct cache_entry *ce = cache[i];
-               if (ce_stage(ce) || (ce->ce_flags & CE_INTENT_TO_ADD)) {
+               if (ce_stage(ce)) {
 +                      if (silent)
 +                              return -1;
                        if (10 < ++funny) {
                                fprintf(stderr, "...\n");
                                break;