Merge branch 'ds/feature-macros'
commit4d6fb2beeb80f4899b0267d91c983c91772438f0
authorJunio C Hamano <gitster@pobox.com>
Thu, 24 Oct 2019 04:34:02 +0000 (24 13:34 +0900)
committerJunio C Hamano <gitster@pobox.com>
Thu, 24 Oct 2019 04:34:03 +0000 (24 13:34 +0900)
tree793d62db0b61f862d9cfcefe47de213cb1c1da57
parent5f0b6ed90739f9a62685360be4a30fe0b80ce06a
parentc11e9966cb7a2e6b1069df43796815d119cf2d7f
Merge branch 'ds/feature-macros'

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
repo-settings.c