Merge branch 'jc/index-update-if-able' into maint * jc/index-update-if-able: update $GIT_INDEX_FILE when there are racily clean entries diff/status: refactor opportunistic index update