summaryrefslogtreecommitdiff
path: root/builtin-merge-ours.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2008-03-04 02:02:35 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-03-05 10:32:01 -0800
commit79b1138e7894ea048008f6b99908f5cd36e94949 (patch)
tree22ce33a3dc57a1f22208a104bf700efacce45fd7 /builtin-merge-ours.c
parentRevert "unpack-objects: prevent writing of inconsistent objects" (diff)
downloadtgif-79b1138e7894ea048008f6b99908f5cd36e94949.tar.xz
fsck.c: fix bogus "empty tree" check
ba002f3 (builtin-fsck: move common object checking code to fsck.c) did more than what it claimed to. Most notably, it wrongly made an empty tree object an error by pretending to only move code from fsck_tree() in builtin-fsck.c to fsck_tree() in fsck.c, but in fact adding a bogus check to barf on an empty tree. An empty tree object is _unusual_. Recent porcelains try reasonably hard not to let the user create a commit that contains such a tree. Perhaps warning about them in git-fsck may have some merit. HOWEVER. Being unusual and being errorneous are two quite different things. This is especially true now we seem to use the same fsck_$object() code in places other than git-fsck itself. For example, receive-pack should not reject unusual objects, even if it would be a good idea to tighten it to reject incorrect ones. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-merge-ours.c')
0 files changed, 0 insertions, 0 deletions