Merge branch 'jk/maint-null-in-trees'
commit3b753148b636be9dc821feebf85cd7f1739b07a1
authorJunio C Hamano <gitster@pobox.com>
Mon, 27 Aug 2012 18:54:28 +0000 (27 11:54 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 27 Aug 2012 18:54:28 +0000 (27 11:54 -0700)
treee8b95caaf57039b797a844f429806df177a1bde4
parentb9148c37637347cea7b448b57caeb2c58fe64979
parentc479d14a80743b1cb86d77695607f4c81f7d8797
Merge branch 'jk/maint-null-in-trees'

We do not want a link to 0{40} object stored anywhere in our objects.

* jk/maint-null-in-trees:
  fsck: detect null sha1 in tree entries
  do not write null sha1s to on-disk index
  diff: do not use null sha1 as a sentinel value
15 files changed:
builtin.h
builtin/blame.c
builtin/cat-file.c
builtin/diff.c
combine-diff.c
diff-no-index.c
diff.c
diff.h
diffcore-rename.c
diffcore.h
fsck.c
read-cache.c
revision.c
t/t1450-fsck.sh
tree-diff.c