cache-tree: remove dead i-t-a code in verify_cache()
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>
Sun, 16 Dec 2012 04:15:25 +0000 (11:15 +0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 16 Dec 2012 07:04:21 +0000 (23:04 -0800)
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>
cache-tree.c

index 28ed6574a2faf3151056aa20e681e06a157e4a2d..e2beab584b6b11c8d38b8031e8eff139ab1a4d7c 100644 (file)
@@ -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)