diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2012-12-16 11:15:25 +0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-12-15 23:04:21 -0800 |
| commit | dbc3904ebc604bf5b818d9840b79228aacdd1343 (patch) | |
| tree | a56387fb4b85cbe38ea4370d6dfc44ba14999953 /cache-tree.c | |
| parent | 7e2010537e96d0a1144520222f20ba1dc3d61441 (diff) | |
| download | git-dbc3904ebc604bf5b818d9840b79228aacdd1343.tar.gz | |
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>
Diffstat (limited to 'cache-tree.c')
| -rw-r--r-- | cache-tree.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/cache-tree.c b/cache-tree.c index 28ed6574a2..e2beab584b 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) |