correct back git commands for prune and branch listing, improved settings ui

Author: MrRazor22

GitWorkTree/Helpers/GitHelper.cs

@@ -32,13 +32,13 @@ private static async Task<bool> ExecuteAsync(GitCommandArgs gitCommandArgs, Acti
             if (gitCommandArgs == null || string.IsNullOrEmpty(gitCommandArgs.WorkingDirectory))
             {
                 outputWindow?.WriteToOutputWindowAsync("The working directory is invalid or not loaded yet");
-                return false; 
+                return false;
             }
 
             if (!File.Exists(GitPath))
             {
                 outputWindow?.WriteToOutputWindowAsync($"Git executable not found at: {GitPath}", true);
-                return false; 
+                return false;
             }
 
             outputWindow?.WriteToOutputWindowAsync($"Executing Git command: {gitCommandArgs.Argument}", true);
@@ -48,7 +48,7 @@ private static async Task<bool> ExecuteAsync(GitCommandArgs gitCommandArgs, Acti
                 var startInfo = new ProcessStartInfo
                 {
                     FileName = GitPath,
-                    Arguments = $"--no-pager --no-color {gitCommandArgs.Argument}",
+                    Arguments = gitCommandArgs.Argument,
                     WorkingDirectory = gitCommandArgs.WorkingDirectory,
                     UseShellExecute = false,
                     CreateNoWindow = true,
@@ -131,7 +131,7 @@ public static async Task<List<string>> GetBranchesAsync(string repositoryPath)
             var isCompleted = await ExecuteAsync(new GitCommandArgs()
             {
                 WorkingDirectory = repositoryPath,
-                Argument = "branch -a"
+                Argument = "--no-pager branch -a --no-color"
             }, (line) =>
             {
                 if (!string.IsNullOrWhiteSpace(line))
@@ -175,7 +175,7 @@ public static async Task<bool> PruneAsync(string repositoryPath)
         {
             return await ExecuteAsync(new GitCommandArgs()
             {
-                Argument = "prune",
+                Argument = "worktree prune --expire=now",
                 WorkingDirectory = repositoryPath
             }, (line) =>
             {

GitWorkTree/Options/General.cs

@@ -9,20 +9,21 @@ public partial class OptionsProvider
         public class GeneralOptions : BaseOptionPage<General>
         {
             public bool IsLoadSolution { get; set; }
-            public string DefaultBranchPath { get; set; }
+            public string DefaultWorktreeDirectory { get; set; }
         }
     }
 
     public class General : BaseOptionModel<General>
     {
-        [DisplayName("Load Solution: ")]
-        [Description("Load Worktree solution in Visual Studio immediately after worktree creation")]
-        [DefaultValue("True")]
+        [DisplayName("Load Solution")]
+        [Description("Automatically load the worktree solution in Visual Studio after creation.")]
+        [DefaultValue(true)]
         public bool IsLoadSolution { get; set; }
 
-        [DisplayName("Default Branch Path: ")]
-        [Description("Default Branch Path to load newly created Worktrees")]
+
+        [DisplayName("Default Worktree Directory: ")]
+        [Description("Path where new worktrees will be created. If empty, the current repository directory will be used.")]
         [DefaultValue("")]
-        public string DefaultBranchPath { get; set; }
+        public string DefaultWorktreeDirectory { get; set; }
     }
 }

GitWorkTree/ViewModel/WorkTreeDialogViewModel.cs

@@ -221,7 +221,7 @@ private async Task<bool> UpdateFolderPath()
             {
                 if (!(commandType == CommandType.Create) || _selectedBranch_Worktree == null) return false;
                 string worktreePath = Path.Combine(Directory.GetParent(_activeRepositoryPath).FullName, $"{_activeRepositoryPath}_Worktrees");
-                string pathPrefix = String.IsNullOrEmpty(optionsSaved.DefaultBranchPath) ? $"{worktreePath}" : optionsSaved.DefaultBranchPath;
+                string pathPrefix = String.IsNullOrEmpty(optionsSaved.DefaultWorktreeDirectory) ? $"{worktreePath}" : optionsSaved.DefaultWorktreeDirectory;
                 string cleanedBranchName = _selectedBranch_Worktree.ToFolderFormat();
 
                 await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync();