From 1d03eb590ca8bbc7d4a0d9432a8eb17d968614a3 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Sat, 27 Sep 2025 21:31:38 +0100 Subject: [PATCH] vc-test--checkin-patch: Restore alternative revert code path * test/lisp/vc/vc-tests/vc-tests.el (vc-test--checkin-patch): For the last stage of the test, restore alternative code path for Git, though this time limited to when running the test on MS-Windows. Cf. subthread starting from . --- test/lisp/vc/vc-tests/vc-tests.el | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/test/lisp/vc/vc-tests/vc-tests.el b/test/lisp/vc/vc-tests/vc-tests.el index 38c659950c2..1625c3501db 100644 --- a/test/lisp/vc/vc-tests/vc-tests.el +++ b/test/lisp/vc/vc-tests/vc-tests.el @@ -881,7 +881,15 @@ This checks also `vc-backend' and `vc-responsible-backend'." ;; Should take the author, date but not the comment from ;; PATCH-STRING. (let ((patch-string (get-patch-string))) - (revert "Revert modification, second time") + ;; FIXME: Why doesn't `revert' work properly here? + (if (and (eq backend 'Git) + (eq system-type 'windows-nt)) + (with-current-buffer buf + (vc-checkin (list file) backend) + (insert "Revert modification, second time") + (let (vc-async-checkin) + (log-edit-done))) + (revert "Revert modification, second time")) (vc-call-backend backend 'checkin-patch patch-string desc2)) (check author date desc2))