From: Dmitry Gutov <dgutov@yandex.ru>
Date: Mon, 17 Oct 2022 23:33:43 +0000 (+0300)
Subject: Follow-up fixes for vc-default-checkin-patch
X-Git-Tag: emacs-29.0.90~1616^2~570
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5e7726552340a3a27b3445b2094bdcc004277d2a;p=emacs.git

Follow-up fixes for vc-default-checkin-patch

* lisp/vc/vc.el (vc-default-checkin-patch):
Call vc-revert-file on buffer-file-name (vc-backend failed on
relative name sometimes).  Delete the tmp dir after copying all
files back, not just the first one.  Bug#52349,
https://lists.gnu.org/archive/html/emacs-devel/2022-10/msg01446.html.
---

diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index 7152b51eff6..2a09d70209d 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -1696,7 +1696,7 @@ Runs the normal hooks `vc-before-checkin-hook' and `vc-checkin-hook'."
         (progn
           (dolist (f files)
             (with-current-buffer (find-file-noselect f)
-              (vc-revert-file f)))
+              (vc-revert-file buffer-file-name)))
           (with-temp-buffer
             ;; Trying to support CVS too.  Assuming that vc-diff
             ;; there will usually the diff root in default-directory.
@@ -1724,8 +1724,8 @@ Runs the normal hooks `vc-before-checkin-hook' and `vc-checkin-hook'."
                    (expand-file-name f)
                    t)
         (with-current-buffer (get-file-buffer f)
-          (revert-buffer t t t))
-        (delete-directory tmpdir t)))))
+          (revert-buffer t t t)))
+      (delete-directory tmpdir t))))
 
 ;;; Additional entry points for examining version histories