]> git.eshelyaron.com Git - emacs.git/commitdiff
Follow-up fixes for vc-default-checkin-patch
authorDmitry Gutov <dgutov@yandex.ru>
Mon, 17 Oct 2022 23:33:43 +0000 (02:33 +0300)
committerDmitry Gutov <dgutov@yandex.ru>
Mon, 17 Oct 2022 23:35:05 +0000 (02:35 +0300)
* 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.

lisp/vc/vc.el

index 7152b51eff69f0c022c822815cc3698bf5342037..2a09d70209de61d708282c31621bb755f07e78d7 100644 (file)
@@ -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