]> git.eshelyaron.com Git - emacs.git/commitdiff
(vc-default-checkin-patch): Try to be compatible with BSD 'patch'
authorDmitry Gutov <dmitry@gutov.dev>
Sat, 14 Oct 2023 17:10:08 +0000 (20:10 +0300)
committerDmitry Gutov <dmitry@gutov.dev>
Sat, 14 Oct 2023 17:10:08 +0000 (20:10 +0300)
* lisp/vc/vc.el (vc-default-checkin-patch):
Try to be compatible with BSD 'patch' (bug#66211).

lisp/vc/vc.el

index e4ce75107ffec31baddf7d2664b6e018019ea921..95f9218dcbfceb77f4647c16b25f07834375f6dc 100644 (file)
@@ -1738,7 +1738,8 @@ Runs the normal hooks `vc-before-checkin-hook' and `vc-checkin-hook'."
                                              nil
                                              "-p1"
                                              "-r" null-device
-                                             "--no-backup-if-mismatch"
+                                             "--posix"
+                                             "--remove-empty-files"
                                              "-i" "-"))
               (user-error "Patch failed: %s" (buffer-string))))
           (vc-call-backend backend 'checkin files comment))