emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

emacs-29 baaa9f42e5 1/2: vc-git-checkin: Don't try to apply an empty pat


From: Sean Whitton
Subject: emacs-29 baaa9f42e5 1/2: vc-git-checkin: Don't try to apply an empty patch
Date: Thu, 22 Dec 2022 15:39:31 -0500 (EST)

branch: emacs-29
commit baaa9f42e574aa5eceeb4b9354a42ccb8ff1969a
Author: Sean Whitton <spwhitton@spwhitton.name>
Commit: Sean Whitton <spwhitton@spwhitton.name>

    vc-git-checkin: Don't try to apply an empty patch
    
    * lisp/vc/vc-git.el (vc-git-checkin): Don't try to apply an empty
    patch to the index, because in that case 'git apply' fails.
    
    (cherry picked from commit 1424342225ef5b18c630364dd88e004f4ebb1c7f)
---
 lisp/vc/vc-git.el | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index b5959d535c..afaaa44e90 100644
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -1041,12 +1041,13 @@ It is based on `log-edit-mode', and has Git-specific 
extensions."
                         (string-replace file-diff "" vc-git-patch-string))
                 (user-error "Index not empty"))
               (setq pos (point))))))
-      (let ((patch-file (make-nearby-temp-file "git-patch")))
-        (with-temp-file patch-file
-          (insert vc-git-patch-string))
-        (unwind-protect
-            (vc-git-command nil 0 patch-file "apply" "--cached")
-          (delete-file patch-file))))
+      (unless (string-empty-p vc-git-patch-string)
+        (let ((patch-file (make-nearby-temp-file "git-patch")))
+          (with-temp-file patch-file
+            (insert vc-git-patch-string))
+          (unwind-protect
+              (vc-git-command nil 0 patch-file "apply" "--cached")
+            (delete-file patch-file)))))
     (cl-flet ((boolean-arg-fn
                (argument)
                (lambda (value) (when (equal value "yes") (list argument)))))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]