Skip to content

Commit f6ff978

Browse files
derrickstoleedscho
authored andcommitted
gvfs: allow overriding core.gvfs
In earlier versions of `microsoft/git`, we found a user who had set `core.gvfs = false` in their global config. This should not have been necessary, but it also should not have caused a problem. However, it did. The reason was that `gvfs_load_config_value()` was called from `config.c` when reading config key/value pairs from all the config files. The local config should override the global config, and this is done by `config.c` reading the global config first then reading the local config. However, our logic only allowed writing the `core_gvfs` variable once. In v2.51.0, we had to adapt to upstream changes that changed way the `core.gvfs` config value is read, and the special handling is no longer necessary, yet we still want the test case that ensures that this bug does not experience a regression. Signed-off-by: Derrick Stolee <[email protected]> Signed-off-by: Johannes Schindelin <[email protected]>
1 parent d13f97b commit f6ff978

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

t/t0021-conversion.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -348,6 +348,10 @@ test_expect_success "filter: smudge filters blocked when under GVFS" '
348348
test_config filter.empty-in-repo.smudge "echo smudged && cat" &&
349349
test_config core.gvfs 64 &&
350350
351+
test_must_fail git checkout &&
352+
353+
# ensure the local core.gvfs setting overwrites the global setting
354+
git config --global core.gvfs false &&
351355
test_must_fail git checkout
352356
'
353357

0 commit comments

Comments
 (0)