diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-10-24 06:34:02 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-10-24 06:34:03 +0200 |
| commit | 4d6fb2beeb80f4899b0267d91c983c91772438f0 (patch) | |
| tree | 793d62db0b61f862d9cfcefe47de213cb1c1da57 /repo-settings.c | |
| parent | Merge branch 'js/azure-ci-osx-fix' (diff) | |
| parent | repo-settings: read an int for index.version (diff) | |
| download | git-4d6fb2beeb80f4899b0267d91c983c91772438f0.tar.xz git-4d6fb2beeb80f4899b0267d91c983c91772438f0.zip | |
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
Diffstat (limited to 'repo-settings.c')
| -rw-r--r-- | repo-settings.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/repo-settings.c b/repo-settings.c index 05546db98e..a703e407a3 100644 --- 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) |