From c0ffa8958eba358b6c8ad072912b1fcd5aa7dfa6 Mon Sep 17 00:00:00 2001 From: Dmitry Gutov Date: Sat, 14 Oct 2023 20:10:08 +0300 Subject: [PATCH] (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)) -- 2.39.2