Skip to content

Commit dbc3904

Browse files
pcloudsgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Nguyễn Thái Ngọc Duy <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 7e20105 commit dbc3904

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

cache-tree.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -166,12 +166,8 @@ static int verify_cache(struct cache_entry **cache,
166166
fprintf(stderr, "...\n");
167167
break;
168168
}
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));
175171
}
176172
}
177173
if (funny)

0 commit comments

Comments
 (0)