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

diff --git a/repo-settings.c b/repo-settings.c
index 05546db98eebb469bfeca854de1c3f4e9cc25b5b..a703e407a3f0a9c55c9a18ad1db6bf345f1165dd 100644 (file)
--- a/repo-settings.c
+++ b/repo-settings.c
@@ -22,7 +22,7 @@ void prepare_repo_settings(struct repository *r)
        UPDATE_DEFAULT_BOOL(r->settings.core_commit_graph, 1);
        UPDATE_DEFAULT_BOOL(r->settings.gc_write_commit_graph, 1);
 
-       if (!repo_config_get_bool(r, "index.version", &value))
+       if (!repo_config_get_int(r, "index.version", &value))
                r->settings.index_version = value;
        if (!repo_config_get_maybe_bool(r, "core.untrackedcache", &value)) {
                if (value == 0)

diff --git a/t/t1600-index.sh b/t/t1600-index.sh
index c77721b580c1535de33f3bd109c95bb52200a691..b7c31aa86a11ffbecd7c82a3ab3e920105caf71f 100755 (executable)
--- a/t/t1600-index.sh
+++ b/t/t1600-index.sh
@@ -87,6 +87,10 @@ test_index_version () {
 }
 
 test_expect_success 'index version config precedence' '
+       test_index_version 0 false 0 2 &&
+       test_index_version 2 false 0 2 &&
+       test_index_version 3 false 0 2 &&
+       test_index_version 4 false 0 4 &&
        test_index_version 2 false 4 4 &&
        test_index_version 2 true 0 2 &&
        test_index_version 0 true 0 4 &&