Skip to content

Feature: Added SSH support for Git and progress reporting in Status Center #18063

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

Open
NyanHeart wants to merge 2 commits into
base: main
Choose a base branch
from
+563 −67
Open

Feature: Added SSH support for Git and progress reporting in Status Center #18063

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bfbc9a2
Feature: Enhanced Git Support (SSH Agent & Status Center) (#17692)
NyanHeart Jan 14, 2026
f0be692
Fix: Address PR review comments (threading, cleanup & error handling)
NyanHeart Jan 16, 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
3 changes: 1 addition & 2 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@
<PackageVersion Include="CommunityToolkit.WinUI.Triggers" Version="8.2.251219" />
<PackageVersion Include="DiscUtils.Udf" Version="0.16.13" />
<PackageVersion Include="FluentFTP" Version="53.0.2" />
<!-- Note, 0.31 causes issues with repos cloned via ssh -->
<PackageVersion Include="LibGit2Sharp" Version="0.30.0" />
<PackageVersion Include="LibGit2Sharp" Version="0.31.0" />
<PackageVersion Include="MessageFormat" Version="7.1.3" />
<PackageVersion Include="Microsoft.Data.Sqlite.Core" Version="9.0.9" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.9" />
Expand Down
6 changes: 2 additions & 4 deletions src/Files.App/Actions/Git/GitFetchAction.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,9 @@ public GitFetchAction()
_context.PropertyChanged += Context_PropertyChanged;
}

public Task ExecuteAsync(object? parameter = null)
public async Task ExecuteAsync(object? parameter = null)
{
GitHelpers.FetchOrigin(_context.ShellPage!.InstanceViewModel.GitRepositoryPath);

return Task.CompletedTask;
await GitHelpers.FetchOrigin(_context.ShellPage!.InstanceViewModel.GitRepositoryPath);
}

private void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e)
Expand Down
15 changes: 15 additions & 0 deletions src/Files.App/Data/Enums/FileOperationType.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,5 +72,20 @@ public enum FileOperationType : byte
/// A font has been installed
/// </summary>
InstallFont = 13,

/// <summary>
/// A git repo has been pushed
/// </summary>
GitPush = 14,

/// <summary>
/// A git repo has been fetched
/// </summary>
GitFetch = 15,

/// <summary>
/// A git repo has been pulled
/// </summary>
GitPull = 16,
}
}
99 changes: 99 additions & 0 deletions src/Files.App/Strings/en-US/Resources.resw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3738,6 +3738,105 @@
<value>Failed to empty Recycle Bin</value>
<comment>Shown in a StatusCenter card.</comment>
</data>
<data name="StatusCenter_GitPushCanceled_Header" xml:space="preserve">
<value>Canceled pushing to "{0}"</value>
<comment>Shown in a StatusCenter card.</comment>
</data>
<data name="StatusCenter_GitPushCanceled_SubHeader" xml:space="preserve">
<value>Canceled pushing branch "{0}" to "{1}"</value>
<comment>Shown in a StatusCenter card.</comment>
</data>
<data name="StatusCenter_GitPushComplete_Header" xml:space="preserve">
<value>Pushed to "{0}"</value>
<comment>Shown in a StatusCenter card.</comment>
</data>
<data name="StatusCenter_GitPushComplete_SubHeader" xml:space="preserve">
<value>Pushed branch "{0}" to "{1}"</value>
<comment>Shown in a StatusCenter card.</comment>
</data>
<data name="StatusCenter_GitPushFailed_Header" xml:space="preserve">
<value>Error pushing to "{0}"</value>
<comment>Shown in a StatusCenter card.</comment>
</data>
<data name="StatusCenter_GitPushFailed_SubHeader" xml:space="preserve">
<value>Failed to push branch "{0}" to "{1}"</value>
<comment>Shown in a StatusCenter card.</comment>
</data>
<data name="StatusCenter_GitPushInProgress_Header" xml:space="preserve">
<value>Pushing to "{0}"</value>
<comment>Shown in a StatusCenter card.</comment>
</data>
<data name="StatusCenter_GitPushInProgress_SubHeader" xml:space="preserve">
<value>Pushing branch "{0}" to "{1}"</value>
<comment>Shown in a StatusCenter card.</comment>
</data>
<data name="StatusCenter_GitFetchCanceled_Header" xml:space="preserve">
<value>Canceled fetching from "{0}"</value>
<comment>Shown in a StatusCenter card.</comment>
</data>
<data name="StatusCenter_GitFetchCanceled_SubHeader" xml:space="preserve">
<value>Canceled fetching from "{0}"</value>
<comment>Shown in a StatusCenter card.</comment>
</data>
<data name="StatusCenter_GitFetchComplete_Header" xml:space="preserve">
<value>Fetched from "{0}"</value>
<comment>Shown in a StatusCenter card.</comment>
</data>
<data name="StatusCenter_GitFetchComplete_SubHeader" xml:space="preserve">
<value>Fetched from "{0}"</value>
<comment>Shown in a StatusCenter card.</comment>
</data>
<data name="StatusCenter_GitFetchFailed_Header" xml:space="preserve">
<value>Error fetching from "{0}"</value>
<comment>Shown in a StatusCenter card.</comment>
</data>
<data name="StatusCenter_GitFetchFailed_SubHeader" xml:space="preserve">
<value>Failed to fetch from "{0}"</value>
<comment>Shown in a StatusCenter card.</comment>
</data>
<data name="StatusCenter_GitFetchInProgress_Header" xml:space="preserve">
<value>Fetching from "{0}"</value>
<comment>Shown in a StatusCenter card.</comment>
</data>
<data name="StatusCenter_GitFetchInProgress_SubHeader" xml:space="preserve">
<value>Fetching from "{0}"</value>
<comment>Shown in a StatusCenter card.</comment>
</data>
<data name="StatusCenter_GitPullCanceled_Header" xml:space="preserve">
<value>Canceled pulling from "{0}"</value>
<comment>Shown in a StatusCenter card.</comment>
</data>
<data name="StatusCenter_GitPullCanceled_SubHeader" xml:space="preserve">
<value>Canceled pulling branch "{0}" from "{1}"</value>
<comment>Shown in a StatusCenter card.</comment>
</data>
<data name="StatusCenter_GitPullComplete_Header" xml:space="preserve">
<value>Pulled from "{0}"</value>
<comment>Shown in a StatusCenter card.</comment>
</data>
<data name="StatusCenter_GitPullComplete_SubHeader" xml:space="preserve">
<value>Pulled branch "{0}" from "{1}"</value>
<comment>Shown in a StatusCenter card.</comment>
</data>
<data name="StatusCenter_GitPullFailed_Header" xml:space="preserve">
<value>Error pulling from "{0}"</value>
<comment>Shown in a StatusCenter card.</comment>
</data>
<data name="StatusCenter_GitPullFailed_SubHeader" xml:space="preserve">
<value>We couldn't pull the latest changes from the remote right now.</value>
</data>
<data name="GitError_UncommittedChanges" xml:space="preserve">
<value>Please commit or stash your changes before pulling.</value>
<comment>Shown in a StatusCenter card.</comment>
</data>
<data name="StatusCenter_GitPullInProgress_Header" xml:space="preserve">
<value>Pulling from "{0}"</value>
<comment>Shown in a StatusCenter card.</comment>
</data>
<data name="StatusCenter_GitPullInProgress_SubHeader" xml:space="preserve">
<value>Pulling branch "{0}" from "{1}"</value>
<comment>Shown in a StatusCenter card.</comment>
</data>
<data name="StatusCenter_Prepare_Header" xml:space="preserve">
<value>Preparing the operation...</value>
<comment>Shown in a StatusCenter card.</comment>
Expand Down
Loading
Loading