Merge branch 'jk/add-ignore-errors-bit-assignment-fix'
authorJunio C Hamano <gitster@pobox.com>
Thu, 7 Feb 2019 06:05:30 +0000 (22:05 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 7 Feb 2019 06:05:31 +0000 (22:05 -0800)
A hotfix to an incomplete fix made earlier.

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

1  2 
read-cache.c

diff --cc read-cache.c
Simple merge