From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 16 Feb 2012 22:08:00 +0000 (-0800)
Subject: Merge branch 'jc/maint-commit-ignore-i-t-a' into maint
X-Git-Tag: v1.7.9.2~25
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6c63ab3ca7abc50155acc6c28380435fb79f7fa9;p=git.git

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
---

6c63ab3ca7abc50155acc6c28380435fb79f7fa9
diff --cc cache-tree.c
index 8de39590d,ce0d0e3ec..bf03cb7fc
--- a/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;