github-mirrors/sourcegit
1
0
Fork 0
mirror of https://fastgit.cc/github.com/sourcegit-scm/sourcegit synced 2026-04-21 13:20:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: duplicated repo may be added when scanning repositories on case-insensitive platforms (#2230)

Browse Source 
Signed-off-by: leo <longshuang@msn.cn>
This commit is contained in:
leo
2026-04-01 14:22:30 +08:00
parent a05e7975e8
commit 43827a5106
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/ViewModels/ScanRepositories.cs
View File

@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Globalization;
using System.IO;
using System.Threading.Tasks;
@@ -95,12 +96,12 @@ namespace SourceGit.ViewModels
foreach (var f in found)
{
var parent = new DirectoryInfo(f).Parent!.FullName.Replace('\\', '/').TrimEnd('/');
if (parent.Equals(normalizedRoot, StringComparison.Ordinal))
if (parent.Equals(normalizedRoot, StringComparison.OrdinalIgnoreCase))
{
var node = Preferences.Instance.FindOrAddNodeByRepositoryPath(f, null, false, false);
await node.UpdateStatusAsync(false, null);
}
else if (parent.StartsWith(normalizedRoot, StringComparison.Ordinal))
else if (parent.StartsWith(normalizedRoot, StringComparison.OrdinalIgnoreCase))
{
var relative = parent.Substring(normalizedRoot.Length).TrimStart('/');
var group = FindOrCreateGroupRecursive(Preferences.Instance.RepositoryNodes, relative);
@@ -120,7 +121,7 @@ namespace SourceGit.ViewModels
foreach (var node in group)
{
if (node.IsRepository)
repos.Add(node.Id);
repos.Add(OperatingSystem.IsLinux() ? node.Id : node.Id.ToLower(CultureInfo.CurrentCulture));
else
GetManagedRepositories(node.SubNodes, repos);
}
@@ -138,7 +139,7 @@ namespace SourceGit.ViewModels
ProgressDescription = $"Scanning {subdir.FullName}...";
var normalizedSelf = subdir.FullName.Replace('\\', '/').TrimEnd('/');
if (_managed.Contains(normalizedSelf))
if (IsManaged(normalizedSelf))
continue;
var gitDir = Path.Combine(subdir.FullName, ".git");
@@ -148,7 +149,7 @@ namespace SourceGit.ViewModels
if (test.IsSuccess && !string.IsNullOrEmpty(test.StdOut))
{
var normalized = test.StdOut.Trim().Replace('\\', '/').TrimEnd('/');
if (!_managed.Contains(normalized))
if (!IsManaged(normalized))
outs.Add(normalized);
}
@@ -200,6 +201,14 @@ namespace SourceGit.ViewModels
return added;
}
private bool IsManaged(string path)
{
if (OperatingSystem.IsLinux())
return _managed.Contains(path);
return _managed.Contains(path.ToLower(CultureInfo.CurrentCulture));
}
private HashSet<string> _managed = new();
private bool _useCustomDir = false;
private string _customDir = string.Empty;