Skip to content

Commit

Permalink
cache-tree: remove dead i-t-a code in verify_cache()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Nguyễn Thái Ngọc Duy authored and Junio C Hamano committed Dec 16, 2012
1 parent 7e20105 commit dbc3904
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions cache-tree.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit dbc3904

Please sign in to comment.