Merge branch 'jk/no-null-sha1-in-cache-tree'
authorJunio C Hamano <gitster@pobox.com>
Tue, 16 May 2017 02:51:50 +0000 (11:51 +0900)
committerJunio C Hamano <gitster@pobox.com>
Tue, 16 May 2017 02:51:50 +0000 (11:51 +0900)
Code to update the cache-tree has been tightened so that we won't
accidentally write out any 0{40} entry in the tree object.

* jk/no-null-sha1-in-cache-tree:
cache-tree: reject entries with null sha1

1  2 
read-cache.c
diff --cc read-cache.c
Simple merge