tree 793d62db0b61f862d9cfcefe47de213cb1c1da57
parent 5f0b6ed90739f9a62685360be4a30fe0b80ce06a
parent c11e9966cb7a2e6b1069df43796815d119cf2d7f
author Junio C Hamano <gitster@pobox.com> 1571891642 +0900
committer Junio C Hamano <gitster@pobox.com> 1571891643 +0900

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