From bf1242646c226ab740e93d368f123eee8c276cbd Mon Sep 17 00:00:00 2001 From: Gadfly Date: Tue, 21 Jan 2025 12:27:06 +0800 Subject: [PATCH 1/2] fix: prevent target branch HEAD from being changed when adding worktree Signed-off-by: Gadfly --- src/Commands/Worktree.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Commands/Worktree.cs b/src/Commands/Worktree.cs index 7516b1e3f..27c0e28ee 100644 --- a/src/Commands/Worktree.cs +++ b/src/Commands/Worktree.cs @@ -73,6 +73,8 @@ public bool Add(string fullpath, string name, bool createNew, string tracking, A if (!string.IsNullOrEmpty(tracking)) Args += tracking; + else if (!string.IsNullOrEmpty(name) && !createNew) + Args += name; _outputHandler = outputHandler; return Exec(); From 2003ce0902ba2816c2c4f0f0c5159e5061100ee3 Mon Sep 17 00:00:00 2001 From: Gadfly Date: Tue, 21 Jan 2025 12:49:39 +0800 Subject: [PATCH 2/2] fix: worktree path validator trigger error Signed-off-by: Gadfly --- src/ViewModels/AddWorktree.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ViewModels/AddWorktree.cs b/src/ViewModels/AddWorktree.cs index cf7360294..6c1c74816 100644 --- a/src/ViewModels/AddWorktree.cs +++ b/src/ViewModels/AddWorktree.cs @@ -12,7 +12,7 @@ public class AddWorktree : Popup public string Path { get => _path; - set => SetProperty(ref _path, value); + set => SetProperty(ref _path, value, true); } public bool CreateNewBranch