cache-tree: remove dead i-t-a code in verify_cache()
This code is added in 331fcb5 (git add --intent-to-add: do not let an empty blob be committed by accident - 2008-11-28) to forbid committing when i-t-a entries are present. When we allow that, we forgot to remove this. Noticed-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Nguyễn Thái Ngọc Duy committed
Dec 16, 2012 at 11:15 UTC
dbc3904ebc604bf5b818d9840b79228aacdd1343
1 file changed
+2
-6
cache-tree.c
+2
-6
@@ -166,12 +166,8 @@ static int verify_cache(struct cache_entry **cache,
166
fprintf(stderr, "...\n");
167
break;
168
}
169
- if (ce_stage(ce))
170
- fprintf(stderr, "%s: unmerged (%s)\n",
171
- ce->name, sha1_to_hex(ce->sha1));
172
- else
173
- fprintf(stderr, "%s: not added yet\n",
174
- ce->name);
169
+ fprintf(stderr, "%s: unmerged (%s)\n",
170
+ ce->name, sha1_to_hex(ce->sha1));
171
}
172
}
173
if (funny)