Workaround libgit2 safe.directory case mismatch bug#1899
Merged
tyrielv merged 2 commits intomicrosoft:masterfrom Mar 9, 2026
Merged
Workaround libgit2 safe.directory case mismatch bug#1899tyrielv merged 2 commits intomicrosoft:masterfrom
tyrielv merged 2 commits intomicrosoft:masterfrom
Conversation
tyrielv
force-pushed
the
tyrielv/safedirectory-caseinsensitive
branch
from
9f64938 to
ba58df0
Compare
tyrielv
force-pushed
the
tyrielv/safedirectory-caseinsensitive
branch
from
61345a8 to
a5e262e
Compare
dscho
reviewed
Mar 3, 2026
GVFS/GVFS.FunctionalTests/Tests/EnlistmentPerTestCase/SafeDirectoryOwnershipTests.cs
Outdated
Show resolved
Hide resolved
Replace the heavyweight SafeDirectoryOwnershipTests functional test (which required elevation, P/Invoke for SeRestorePrivilege, directory ownership changes, and global git config manipulation) with two layers of lightweight unit tests: Layer 1: NormalizePathForSafeDirectoryComparison - pure string tests covering backslash/forward-slash conversion, case normalization, trailing slash trimming, and null/empty safety. Layer 2: Constructor control-flow tests using a mock subclass that overrides the native calls (InitNative, TryOpenRepo, GetLastNativeError, GetSafeDirectoryConfigEntries) to verify the safe.directory case- sensitivity workaround logic without touching libgit2 or real config. To support testability, extract virtual methods from LibGit2Repo for native interactions and make CheckSafeDirectoryConfigForCaseSensitivity- Issue protected. The NormalizePath helper is renamed to NormalizePathForSafeDirectoryComparison and scoped as internal. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
derrickstolee
approved these changes
Mar 9, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Libgit2 has a bug where it is case sensitive for safe.directory (especially the drive letter) when git.exe isn't. Until a fix can be made and propagated, work around it by matching the repo path requested to the configured safe directory.
See libgit2/libgit2#7037