From b398b1eeddb2118e5e00e2341d80626496488021 Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Sat, 8 Jun 2019 15:06:16 +0200
Subject: vim-patch.sh: use --no-backup-if-mismatch [ci skip] #10156

---
 scripts/vim-patch.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scripts/vim-patch.sh')

diff --git a/scripts/vim-patch.sh b/scripts/vim-patch.sh
index 6218ba378a..a9e9c5d6c3 100755
--- a/scripts/vim-patch.sh
+++ b/scripts/vim-patch.sh
@@ -258,7 +258,7 @@ stage_patch() {
       msg_err "'patch' command not found\n"
     else
       printf "\nApplying patch...\n"
-      patch -p1 --fuzz=1 --suffix= < "${patch_file}" || ret=$?
+      patch -p1 --fuzz=1 --no-backup-if-mismatch < "${patch_file}" || ret=$?
     fi
     printf "\nInstructions:\n  Proceed to port the patch.\n"
   else
-- 
cgit