]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'jk/write-broken-index-with-nul-sha1'
authorJunio C Hamano <gitster@pobox.com>
Tue, 17 Sep 2013 18:40:27 +0000 (11:40 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 17 Sep 2013 18:40:27 +0000 (11:40 -0700)
Earlier we started rejecting an attempt to add 0{40} object name to
the index and to tree objects, but it sometimes is necessary to
allow so to be able to use tools like filter-branch to correct such
broken tree objects.

* jk/write-broken-index-with-nul-sha1:
  write_index: optionally allow broken null sha1s

1  2 
read-cache.c

diff --cc read-cache.c
Simple merge