master 1424342225 2/2: vc-git-checkin: Don't try to apply an empty patch

[Sean Whitton]

branch: master
commit 1424342225ef5b18c630364dd88e004f4ebb1c7f
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.
---
 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 8f995021dc..0a4e9caa61 100644
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -1056,12 +1056,13 @@ It is based on `log-edit-mode', and has Git-specific 
extensions."
                      (vc-git-command nil 0 file-name "reset" "-q" "--"))
                     (t (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)))))