diff --git a/src/Commands/QueryBranches.cs b/src/Commands/QueryBranches.cs index 910e5fd2..d0ecd322 100644 --- a/src/Commands/QueryBranches.cs +++ b/src/Commands/QueryBranches.cs @@ -58,7 +58,7 @@ namespace SourceGit.Commands if (b.TrackStatus == null) b.TrackStatus = new Models.BranchTrackStatus(); - } + } } } diff --git a/src/Commands/QueryStagedChangesWithAmend.cs b/src/Commands/QueryStagedChangesWithAmend.cs index b20c20dc..78980401 100644 --- a/src/Commands/QueryStagedChangesWithAmend.cs +++ b/src/Commands/QueryStagedChangesWithAmend.cs @@ -24,7 +24,7 @@ namespace SourceGit.Commands var rs = ReadToEnd(); if (!rs.IsSuccess) return []; - + var changes = new List(); var lines = rs.StdOut.Split(['\r', '\n'], StringSplitOptions.RemoveEmptyEntries); foreach (var line in lines) diff --git a/src/Models/Change.cs b/src/Models/Change.cs index 4e0e23ae..6e507051 100644 --- a/src/Models/Change.cs +++ b/src/Models/Change.cs @@ -49,7 +49,6 @@ namespace SourceGit.Models public string OriginalPath { get; set; } = ""; public ChangeDataForAmend DataForAmend { get; set; } = null; public ConflictReason ConflictReason { get; set; } = ConflictReason.None; - public bool IsSubmodule { get; set; } = false; public bool IsConflicted => WorkTree == ChangeState.Conflicted; public void Set(ChangeState index, ChangeState workTree = ChangeState.None) @@ -78,7 +77,7 @@ namespace SourceGit.Models if (Path[0] == '"') Path = Path.Substring(1, Path.Length - 2); - + if (!string.IsNullOrEmpty(OriginalPath) && OriginalPath[0] == '"') OriginalPath = OriginalPath.Substring(1, OriginalPath.Length - 2); } diff --git a/src/ViewModels/Conflict.cs b/src/ViewModels/Conflict.cs index db6492cc..62695f69 100644 --- a/src/ViewModels/Conflict.cs +++ b/src/ViewModels/Conflict.cs @@ -36,7 +36,7 @@ namespace SourceGit.ViewModels get; private set; } - + public object Theirs { get; diff --git a/src/ViewModels/InteractiveRebase.cs b/src/ViewModels/InteractiveRebase.cs index 1c4d4480..7811014a 100644 --- a/src/ViewModels/InteractiveRebase.cs +++ b/src/ViewModels/InteractiveRebase.cs @@ -178,7 +178,7 @@ namespace SourceGit.ViewModels if (action == Models.InteractiveRebaseAction.Squash || action == Models.InteractiveRebaseAction.Fixup) return; } - + item.Action = action; UpdateItems(); } diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs index 8e86e895..c347a10a 100644 --- a/src/ViewModels/Repository.cs +++ b/src/ViewModels/Repository.cs @@ -639,7 +639,7 @@ namespace SourceGit.ViewModels Task.Run(RefreshWorktrees); Task.Run(RefreshWorkingCopyChanges); Task.Run(RefreshStashes); - + Task.Run(() => { var config = new Commands.Config(_fullpath).ListAll(); diff --git a/src/ViewModels/StashesPage.cs b/src/ViewModels/StashesPage.cs index c4263329..5449e4c1 100644 --- a/src/ViewModels/StashesPage.cs +++ b/src/ViewModels/StashesPage.cs @@ -61,7 +61,7 @@ namespace SourceGit.ViewModels { var changes = new Commands.CompareRevisions(_repo.FullPath, $"{value.SHA}^", value.SHA).Result(); var untracked = new List(); - + if (value.Parents.Count == 3) { untracked = new Commands.CompareRevisions(_repo.FullPath, Models.Commit.EmptyTreeSHA1, value.Parents[2]).Result(); diff --git a/src/ViewModels/WorkingCopy.cs b/src/ViewModels/WorkingCopy.cs index 64c7b31d..c60016cd 100644 --- a/src/ViewModels/WorkingCopy.cs +++ b/src/ViewModels/WorkingCopy.cs @@ -1770,7 +1770,7 @@ namespace SourceGit.ViewModels { if (old.Count != cur.Count) return true; - + var oldMap = new Dictionary(); foreach (var c in old) oldMap.Add(c.Path, c); diff --git a/src/Views/InteractiveRebase.axaml.cs b/src/Views/InteractiveRebase.axaml.cs index 00201506..5c8caa53 100644 --- a/src/Views/InteractiveRebase.axaml.cs +++ b/src/Views/InteractiveRebase.axaml.cs @@ -153,7 +153,7 @@ namespace SourceGit.Views e.Handled = true; } } - + private void OnChangeRebaseAction(object sender, RoutedEventArgs e) { if (DataContext is ViewModels.InteractiveRebase vm &&