Merge branch 'ds/feature-macros' into next

The codepath that reads the index.version configuration was broken
with a recent update, which has been corrected.

* ds/feature-macros:
  repo-settings: read an int for index.version

diff --cc repo-settings.c
Simple merge