Skip to content

Code review fixes for Linux enterprise config defaults #1

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
mdellison90-stack merged 3 commits into from
Jan 24, 2026
Merged

Code review fixes for Linux enterprise config defaults #1

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
41ed750
Initial plan
Copilot Jan 22, 2026
6784d08
Fix code review issues in LinuxSettings implementation
Copilot Jan 22, 2026
2301d95
Improve file ordering to use filename only
Copilot Jan 22, 2026
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
10 changes: 5 additions & 5 deletions src/shared/Core/Interop/Linux/LinuxSettings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text;
using Avalonia.Markup.Xaml.MarkupExtensions;

namespace GitCredentialManager.Interop.Linux;

Expand All @@ -15,7 +15,7 @@ public class LinuxSettings : Settings

/// <summary>
/// Reads settings from Git configuration, environment variables, and defaults from the
/// /etc/git-credential-manager.d app configuration directory.
/// /etc/git-credential-manager/config.d app configuration directory.
/// </summary>
public LinuxSettings(IEnvironment environment, IGit git, ITrace trace, IFileSystem fs)
: base(environment, git)
Expand All @@ -40,7 +40,7 @@ protected internal override bool TryGetExternalDefault(string section, string sc
: $"{section}.{scope}.{property}";

// Check if the setting exists in the configuration
if (!_extConfigCache?.TryGetValue(name, out value) ?? false)
if (_extConfigCache == null || !_extConfigCache.TryGetValue(name, out value))
{
// No property exists (or failed to read config)
return false;
Expand All @@ -63,8 +63,8 @@ private IDictionary<string, string> ReadExternalConfiguration()
return null;
}

// Get all the files in the configuration directory
IEnumerable<string> files = _fs.EnumerateFiles(configDir, "*");
// Get all the files in the configuration directory and sort them alphabetically
IEnumerable<string> files = _fs.EnumerateFiles(configDir, "*").OrderBy(f => Path.GetFileName(f));

// Read the contents of each file and concatenate them together
var combinedFile = new StringBuilder();
Expand Down