Merge branch 'jk/add-ignore-errors-bit-assignment-fix'
commit9293bf6f2ee047596d31010520a62f0559cc6097
authorJunio C Hamano <gitster@pobox.com>
Thu, 7 Feb 2019 06:05:30 +0000 (6 22:05 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 7 Feb 2019 06:05:31 +0000 (6 22:05 -0800)
treee42e1701f17e66bd420e23add8a233638bcb3c9f
parentfe8e68659d4d9220e15cd9019ef2153f08db4792
parente2c2a37545f604988424100ed6b1732eb5f36b55
Merge branch 'jk/add-ignore-errors-bit-assignment-fix'

A hotfix to an incomplete fix made earlier.

* jk/add-ignore-errors-bit-assignment-fix:
  add_to_index(): convert forgotten HASH_RENORMALIZE check
read-cache.c