[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master c0ffa8958eb 1/2: (vc-default-checkin-patch): Try to be compatible
From: |
Dmitry Gutov |
Subject: |
master c0ffa8958eb 1/2: (vc-default-checkin-patch): Try to be compatible with BSD 'patch' |
Date: |
Sat, 14 Oct 2023 13:48:09 -0400 (EDT) |
branch: master
commit c0ffa8958eba358b6c8ad072912b1fcd5aa7dfa6
Author: Dmitry Gutov <dmitry@gutov.dev>
Commit: Dmitry Gutov <dmitry@gutov.dev>
(vc-default-checkin-patch): Try to be compatible with BSD 'patch'
* lisp/vc/vc.el (vc-default-checkin-patch):
Try to be compatible with BSD 'patch' (bug#66211).
---
lisp/vc/vc.el | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index e4ce75107ff..95f9218dcbf 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -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))