From 28e95f086a1485883d9afa4be52d51af10a0ea73 Mon Sep 17 00:00:00 2001
From: yindf <yindf@mail.jj.cn>
Date: Tue, 29 Oct 2024 17:58:39 +0800
Subject: [PATCH 1/2] fix watcher stuck by pull

---
 src/ViewModels/Pull.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/ViewModels/Pull.cs b/src/ViewModels/Pull.cs
index fdaad9200..b5c038ae9 100644
--- a/src/ViewModels/Pull.cs
+++ b/src/ViewModels/Pull.cs
@@ -149,7 +149,10 @@ public override Task<bool> Sure()
                     SetProgressDescription($"Fetching remote: {_selectedRemote.Name}...");
                     rs = new Commands.Fetch(_repo.FullPath, _selectedRemote.Name, NoTags, SetProgressDescription).Exec();
                     if (!rs)
+                    {
+                        CallUIThread(() => _repo.SetWatcherEnabled(true));
                         return false;
+                    }
 
                     _repo.MarkFetched();
 

From 93251a73172b985df4500dac4564bc5005fda46a Mon Sep 17 00:00:00 2001
From: yindf <yindf@mail.jj.cn>
Date: Wed, 30 Oct 2024 17:22:23 +0800
Subject: [PATCH 2/2] make stage area resizeable

---
 src/Views/WorkingCopy.axaml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/Views/WorkingCopy.axaml b/src/Views/WorkingCopy.axaml
index 3d080fc6f..5d44dd96c 100644
--- a/src/Views/WorkingCopy.axaml
+++ b/src/Views/WorkingCopy.axaml
@@ -80,6 +80,15 @@
                               ChangeDoubleTapped="OnUnstagedChangeDoubleTapped"
                               KeyDown="OnUnstagedKeyDown"/>
 
+
+      <!-- Splitter -->
+      <GridSplitter Grid.Row="2"
+                    MinWidth="1"
+                    HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
+                    Background="Transparent"
+                    BorderThickness="0,0,1,0"
+                    BorderBrush="{DynamicResource Brush.Border0}"/>
+
       <!-- Staged Toolbar -->
       <Border Grid.Row="2" BorderThickness="0,1" BorderBrush="{DynamicResource Brush.Border0}">
         <Grid ColumnDefinitions="Auto,Auto,Auto,Auto,*,Auto,Auto,Auto">