[PATCH v4 1/4] cache-tree: remove dead i-t-a code in verify_cache()
From: Nguyễn Thái Ngọc Duy <hidden>
Date: 2016-06-15 22:55:32
Subsystem:
the rest · Maintainer:
Linus Torvalds
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 [off-list ref] Signed-off-by: Nguyễn Thái Ngọc Duy <redacted> --- cache-tree.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/cache-tree.c b/cache-tree.c
index 28ed657..e2beab5 100644
--- a/cache-tree.c
+++ b/cache-tree.c@@ -166,12 +166,8 @@ static int verify_cache(struct cache_entry **cache, fprintf(stderr, "...\n"); break; } - if (ce_stage(ce)) - fprintf(stderr, "%s: unmerged (%s)\n", - ce->name, sha1_to_hex(ce->sha1)); - else - fprintf(stderr, "%s: not added yet\n", - ce->name); + fprintf(stderr, "%s: unmerged (%s)\n", + ce->name, sha1_to_hex(ce->sha1)); } } if (funny)
--
1.8.0.rc2.23.g1fb49df