Skip to content

Read gvfs.prefetch-use-idx from the merged git config #2155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Tyrie Vella (tyrielv) merged 1 commit into from
Nov 4, 2026
Merged

Read gvfs.prefetch-use-idx from the merged git config #2155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 5 additions & 16 deletions GVFS/GVFS.Common/Prefetch/BlobPrefetcher.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,22 +404,11 @@ private Func<IObjectExistenceChecker> CreateObjectExistenceCheckerFactory(out ID
{
sharedCheckerOwner = null;

bool usePackIdx = false;
try
{
GitProcess git = new GitProcess(this.Enlistment);
GitProcess.ConfigResult configResult = git.GetFromLocalConfig(GVFSConstants.GitConfig.PrefetchUseIdx);
if (!configResult.TryParseAsString(out string value, out string _) ||
string.IsNullOrEmpty(value) ||
!bool.TryParse(value, out usePackIdx))
{
usePackIdx = GVFSConstants.GitConfig.PrefetchUseIdxDefault;
}
}
catch (Exception ex)
{
this.Tracer.RelatedWarning("Failed to read {0} config: {1}", GVFSConstants.GitConfig.PrefetchUseIdx, ex.Message);
}
bool usePackIdx = LibGit2Repo.GetConfigBoolOrDefault(
this.Tracer,
this.Enlistment.WorkingDirectoryBackingRoot,
GVFSConstants.GitConfig.PrefetchUseIdx,
GVFSConstants.GitConfig.PrefetchUseIdxDefault);

if (usePackIdx)
{
Expand Down
84 changes: 82 additions & 2 deletions GVFS/GVFS.FunctionalTests/Tests/EnlistmentPerFixture/PrefetchVerbTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using GVFS.Tests.Should;
using NUnit.Framework;
using System;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Threading;
Expand Down Expand Up @@ -156,6 +157,80 @@ public void InvalidRetrySettingsDoNotStopAMountedEnlistment()
}
}

[TestCase(null, "pack-index")]
[TestCase("false", "revparse")]
public void PrefetchUseIdxIsReadFromMergedConfig(string localValue, string expectedChecker)
{
string[] keys = new[] { "gvfs.prefetch-use-idx", "gvfs.prefetch-offload" };
Dictionary<string, string> previous = this.ReadLocalConfig(keys);
string homeDirectory = Path.Combine(this.Enlistment.EnlistmentRoot, "global-git-config-" + Guid.NewGuid().ToString("N"));
string globalConfigPath = Path.Combine(homeDirectory, ".gitconfig");
try
{
Directory.CreateDirectory(homeDirectory);
if (localValue == null)
{
this.UnsetLocalConfig(keys[0]);
}
else
{
this.SetLocalConfig(keys[0], localValue);
}

this.SetLocalConfig(keys[1], "false");

ProcessResult originalGlobals = GitProcess.InvokeProcess(this.Enlistment.EnlistmentRoot, "var GIT_CONFIG_GLOBAL");
originalGlobals.ExitCode.ShouldEqual(0, originalGlobals.Errors);
foreach (string originalGlobal in originalGlobals.Output.Split(new[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries))
{
GitProcess.InvokeProcess(this.Enlistment.EnlistmentRoot, $"config --file \"{globalConfigPath}\" --add include.path \"{originalGlobal}\"")
.ExitCode.ShouldEqual(0);
}

// Use a git boolean value that is not "true" to check git boolean parsing.
GitProcess.InvokeProcess(this.Enlistment.EnlistmentRoot, $"config --file \"{globalConfigPath}\" {keys[0]} yes")
.ExitCode.ShouldEqual(0);

ProcessStartInfo startInfo = new ProcessStartInfo(GVFSTestConfig.PathToGVFS)
{
Arguments = $"prefetch --files {Path.Combine("GVFS", "GVFS", "Program.cs")}",
WorkingDirectory = this.Enlistment.RepoRoot,
UseShellExecute = false,
RedirectStandardOutput = true,
RedirectStandardError = true,
CreateNoWindow = true,
};

// libgit2 finds the global config through HOME, and git.exe uses GIT_CONFIG_GLOBAL.
// The temporary global config includes the original global config files, so
// credential settings stay available to the child process.
startInfo.Environment["HOME"] = homeDirectory;
startInfo.Environment["GIT_CONFIG_GLOBAL"] = globalConfigPath;

ProcessResult result = ProcessHelper.Run(startInfo);
result.ExitCode.ShouldEqual(0, result.Output + result.Errors);
string log = Directory.GetFiles(Path.Combine(this.Enlistment.DotGVFSRoot, "logs"), "gvfs_prefetch_*.log")
.OrderByDescending(File.GetLastWriteTimeUtc)
.Select(File.ReadAllText)
.First();
log.ShouldContain($"Prefetch: Using {expectedChecker} object existence checker");
}
finally
{
try
{
this.RestoreLocalConfig(previous);
}
finally
{
if (Directory.Exists(homeDirectory))
{
Directory.Delete(homeDirectory, recursive: true);
}
}
}
}

private Dictionary<string, string> ReadLocalConfig(IEnumerable<string> keys)
{
Dictionary<string, string> values = new Dictionary<string, string>();
Expand All @@ -175,8 +250,7 @@ private void RestoreLocalConfig(Dictionary<string, string> values)
{
if (setting.Value == null)
{
ProcessResult result = GitProcess.InvokeProcess(this.Enlistment.RepoRoot, "config --local --unset-all " + setting.Key);
(result.ExitCode == 0 || result.ExitCode == 5).ShouldEqual(true, result.Errors);
this.UnsetLocalConfig(setting.Key);
}
else
{
Expand All @@ -185,6 +259,12 @@ private void RestoreLocalConfig(Dictionary<string, string> values)
}
}

private void UnsetLocalConfig(string key)
{
ProcessResult result = GitProcess.InvokeProcess(this.Enlistment.RepoRoot, "config --local --unset-all " + key);
(result.ExitCode == 0 || result.ExitCode == 5).ShouldEqual(true, result.Errors);
}

private void SetLocalConfig(string key, string value)
{
ProcessResult result = GitProcess.InvokeProcess(
Expand Down
Loading