1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-30 04:10:54 -08:00

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
<https://lists.gnu.org/archive/html/emacs-devel/2025-09/msg00785.html>.
This commit is contained in:
Sean Whitton 2025-09-27 21:31:38 +01:00
parent 50ab62ad75
commit 1d03eb590c

View file

@ -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))