Merge branch 'nd/narrow' (early part) into jc/add-i-t-a

* 'nd/narrow' (early part):
  Extend index to save more flags

diff --cc cache.h
Simple merge

diff --cc read-cache.c
Simple merge