Merge branch 'jk/maint-null-in-trees' into maint-1.7.11
authorJunio C Hamano <gitster@pobox.com>
Mon, 10 Sep 2012 22:24:53 +0000 (15:24 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 10 Sep 2012 22:24:54 +0000 (15:24 -0700)
commit03adeeaad6c039aadda074de9509f4d845739d55
tree826dba3c67172a391714d5d804dff638844e8025
parent423a9e28fc144624437cb00ce853b741891ae623
parentc479d14a80743b1cb86d77695607f4c81f7d8797
Merge branch 'jk/maint-null-in-trees' into maint-1.7.11

"git diff" had a confusion between taking data from a path in the
working tree and taking data from an object that happens to have
name 0{40} recorded in a tree.

* 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
14 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