From 866fe78d21c0284acd69c07282c6121ad2d2be09 Mon Sep 17 00:00:00 2001
From: Jarno Rajahalme <jarno@isovalent.com>
Date: Sun, 31 May 2026 12:28:16 +0200
Subject: [PATCH] stgit.el: Fix Index/Work Tree incremental refresh

Index/Work Tree incremental refresh has been broken in center mode after
lexical-binding change made in commit 04559f055298df4485116640a3ea76b8e860a0f5.

When stgit-show-worktree-mode is center, stgit-run-series-insert-index
may be called while parsing stg series output inside with-temp-buffer.
Since stgit-index-node and stgit-worktree-node are buffer-local, the
current implementation stores them in the temporary buffer, not the real
stgit-mode buffer.

As a result, after reload in this layout:

stgit-index-node    ;; nil in the stgit buffer
stgit-worktree-node ;; nil in the stgit buffer

Then commands like stgit-toggle-index call:

(stgit-refresh-worktree)
(stgit-refresh-index)

but both are no-ops because the node variables are nil. A full
stgit-reload still works, which is why pressing g fixes the display.

Fix by applying the updated stgit-index-node and stgit-worktree-node to
the real stgit-mode buffer instead.

Fixes: 04559f055298df4485116640a3ea76b8e860a0f5
Fixes: #633

Signed-off-by: Jarno Rajahalme <jarno@isovalent.com>
---
 contrib/stgit.el | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/contrib/stgit.el b/contrib/stgit.el
index baf4ad35..1bf62b04 100644
--- a/contrib/stgit.el
+++ b/contrib/stgit.el
@@ -573,18 +573,21 @@ been advised to update the stgit status when necessary.")
     (ewoc-invalidate (car stgit-worktree-node) (cdr stgit-worktree-node))))
 
 (defun stgit-run-series-insert-index (ewoc)
-  (setq stgit-index-node    (cons ewoc (ewoc-enter-last ewoc
-                                                        (make-stgit-patch
-                                                         :status 'index
-                                                         :name :index
-                                                         :desc nil
-                                                         :empty nil)))
-        stgit-worktree-node (cons ewoc (ewoc-enter-last ewoc
-                                                        (make-stgit-patch
-                                                         :status 'work
-                                                         :name :work
-                                                         :desc nil
-                                                         :empty nil)))))
+  (let ((index-node (ewoc-enter-last ewoc
+                                     (make-stgit-patch
+                                      :status 'index
+                                      :name :index
+                                      :desc nil
+                                      :empty nil)))
+        (worktree-node (ewoc-enter-last ewoc
+                                        (make-stgit-patch
+                                         :status 'work
+                                         :name :work
+                                         :desc nil
+                                         :empty nil))))
+    (with-current-buffer (ewoc--buffer ewoc)
+      (setq stgit-index-node (cons ewoc index-node)
+            stgit-worktree-node (cons ewoc worktree-node)))))
 
 (defun stgit-get-position (&optional position)
   "Return position information at POSITION or point that can be restored later.