Git fork

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

+5 -1
+1 -1
repo-settings.c
··· 22 22 UPDATE_DEFAULT_BOOL(r->settings.core_commit_graph, 1); 23 23 UPDATE_DEFAULT_BOOL(r->settings.gc_write_commit_graph, 1); 24 24 25 - if (!repo_config_get_bool(r, "index.version", &value)) 25 + if (!repo_config_get_int(r, "index.version", &value)) 26 26 r->settings.index_version = value; 27 27 if (!repo_config_get_maybe_bool(r, "core.untrackedcache", &value)) { 28 28 if (value == 0)
+4
t/t1600-index.sh
··· 87 87 } 88 88 89 89 test_expect_success 'index version config precedence' ' 90 + test_index_version 0 false 0 2 && 91 + test_index_version 2 false 0 2 && 92 + test_index_version 3 false 0 2 && 93 + test_index_version 4 false 0 4 && 90 94 test_index_version 2 false 4 4 && 91 95 test_index_version 2 true 0 2 && 92 96 test_index_version 0 true 0 4 &&