From b8cefd6c436dcab09dcc939777880edd40c8a203 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Wed, 3 Dec 2025 11:20:00 +0000 Subject: [PATCH] * lisp/vc/vc.el (vc-pull): Clear cached incoming revisions. --- lisp/vc/vc.el | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index ea8581cd4e1..14509281694 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el @@ -4236,10 +4236,14 @@ tip revision are merged into the working file." (cond ;; If a pull operation is defined, use it. ((vc-find-backend-function backend 'pull) - (vc-call-backend backend 'pull arg)) + (vc-call-backend backend 'pull arg) + ;; FIXME: Ideally we would only clear out the stored value for the + ;; REMOTE-LOCATION from which we are pulling. + (vc-run-delayed + (vc--repo-setprop backend 'vc-incoming-revision nil))) ;; If VCS has `merge-news' functionality (CVS and SVN), use it. ((vc-find-backend-function backend 'merge-news) - (save-some-buffers ; save buffers visiting files + (save-some-buffers ; save buffers visiting files nil (lambda () (and (buffer-modified-p) (let ((file (buffer-file-name)))