From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Dmitry Gutov Newsgroups: gmane.emacs.bugs Subject: bug#66211: 30.0.50; C-x v v in vc-diff does not work with lesser versionf of patch Date: Fri, 29 Sep 2023 20:27:21 +0300 Message-ID: <1e1f0e18-1fe2-4bb4-38f3-1c49de831abc@gutov.dev> References: <83h6nd1msw.fsf@gnu.org> <78f8becb-7150-33cb-537c-47728b305699@gutov.dev> <835y3typge.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="17630"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Cc: ams@gnu.org, 66211@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Fri Sep 29 19:28:08 2023 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qmHHa-0004EQ-Qd for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 29 Sep 2023 19:28:07 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qmHHK-0005Br-8j; Fri, 29 Sep 2023 13:27:50 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qmHHH-0005BM-5s for bug-gnu-emacs@gnu.org; Fri, 29 Sep 2023 13:27:47 -0400 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qmHHG-0006FN-QE for bug-gnu-emacs@gnu.org; Fri, 29 Sep 2023 13:27:46 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qmHHV-0008Gy-M2 for bug-gnu-emacs@gnu.org; Fri, 29 Sep 2023 13:28:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 29 Sep 2023 17:28:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66211 X-GNU-PR-Package: emacs Original-Received: via spool by 66211-submit@debbugs.gnu.org id=B66211.169600847131780 (code B ref 66211); Fri, 29 Sep 2023 17:28:01 +0000 Original-Received: (at 66211) by debbugs.gnu.org; 29 Sep 2023 17:27:51 +0000 Original-Received: from localhost ([127.0.0.1]:57157 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qmHHH-0008GR-TE for submit@debbugs.gnu.org; Fri, 29 Sep 2023 13:27:51 -0400 Original-Received: from out2-smtp.messagingengine.com ([66.111.4.26]:46331) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qmHHF-0008GD-7g for 66211@debbugs.gnu.org; Fri, 29 Sep 2023 13:27:46 -0400 Original-Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 2FBA75C2655; Fri, 29 Sep 2023 13:27:25 -0400 (EDT) Original-Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Fri, 29 Sep 2023 13:27:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gutov.dev; h=cc :cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:sender:subject:subject:to:to; s=fm1; t= 1696008445; x=1696094845; bh=o+v+DgOBmzLFaOfqYz4/eupJUSIL+w5kR8j 3r6YLJFI=; b=Y5cBFza1xGUv7oQ0KHfxAofnAHbr2QnLD1uPtPFv+XKd2XP3CnE NHXb7nqWs1ameqr+LcqVWFv1EGQCG8pBQ/qFCfNU2Z2Ym/r9fNB+A+UIaY2EGk/t YRi/9PhjqkDNsHpzihNyvF2rayvMtW1XcF/0jyKCJe2biwQVVP9ci0aNKEOXdanV lffmIpjtbiSWwOpzjXZ2pGZsvgM2adLftxLPmKGaFYs9GdG8DYRP3ayG9h/urVDf 7+5IWQBYkN+ScEtXfHdwhAxkWPrN/rvG8rGRJYd3kLd7SY8nMQv06bCph6vy3JK7 zLGQAEgmYQlJaKLb067J48QnUPUTJXkApGQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:sender:subject:subject:to:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t= 1696008445; x=1696094845; bh=o+v+DgOBmzLFaOfqYz4/eupJUSIL+w5kR8j 3r6YLJFI=; b=e9qvQVeMPQNbiCCEgjJchZzNO2bSog0YN4fc/s2EhgCj+pAhiWJ oLQu0j4/28hjLsivOCsbf3K9jz9r/R3MXmHZ2S7njh7W9Eyp+vbiL3Il/uaowBvf 6qmrhL68133KQQIs8d7nHbziFp0DmZ+CXUzK1j6e448dKTt8lYOM3+CPnwaTdcXZ WsygYGRvC1euw4SFabdtYDfNV4z8ifab6quu6nT5P1Xye5eJkVvo94384RX1GrFW 3DuUorlRQuiy9+kMqcZvSRD+rve7/6gPGhqQPS+QOiyF++UBKwqfft8y/Pq+yH9M dIHmljvTeiMQD7wN6HZFv2fDp4JoPDYeBFA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrtddvgdduuddvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepkfffgggfuffvvehfhfgjtgfgsehtjeertddtfeejnecuhfhrohhmpeffmhhi thhrhicuifhuthhovhcuoegumhhithhrhiesghhuthhovhdruggvvheqnecuggftrfgrth htvghrnhephfeutdekveeggeetteekfeejffegudduudfhueevleeftdffffeggeeivddv jeelnecuffhomhgrihhnpehgnhhurdhorhhgnecuvehluhhsthgvrhfuihiivgeptdenuc frrghrrghmpehmrghilhhfrhhomhepughmihhtrhihsehguhhtohhvrdguvghv X-ME-Proxy: Feedback-ID: i0e71465a:Fastmail Original-Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 29 Sep 2023 13:27:23 -0400 (EDT) Content-Language: en-US In-Reply-To: <835y3typge.fsf@gnu.org> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:271519 Archived-At: On 29/09/2023 18:22, Eli Zaretskii wrote: >> Date: Fri, 29 Sep 2023 13:22:39 +0300 >> Cc: 66211@debbugs.gnu.org >> From: Dmitry Gutov >> >> On 29/09/2023 10:05, Eli Zaretskii wrote: >>>> From: "Alfred M. Szmidt" >>>> Date: Tue, 26 Sep 2023 08:17:27 -0400 >>>> >>>> >>>> The C-x v v command in a*vc-diff* buffer does not work if you have a >>>> lesser version of patch, e.g., the one on OpenBSD: >>>> >>>> user-error: Patch failed: patch: unknown option -- no-backup-if-mismatch >>>> usage: patch [-bCcEeflNnRstuv] [-B backup-prefix] [-D symbol] [-d directory] >>>> [-F max-fuzz] [-i patchfile] [-o out-file] [-p strip-count] >>>> [-r rej-name] [-V t | nil | never] [-x number] [-z backup-ext] >>>> [--posix] [origfile [patchfile]] >>>> patch >> I don't understand: does "git apply" invoke Patch? AFAICT, "C-x v v" >>> in a*vc-diff* buffer runs "git apply FILE", where FILE is a temporary >>> patch file created from the diffs to be applied. What am I missing? >> >> vc-default-checkin-patch calls 'patch'. It's for other backends. > > Why do we call Patch if we have a way to apply hunks in Lisp? Wasn't > that just discussed in the other thread? https://lists.gnu.org/archive/html/emacs-devel/2022-10/msg01353.html Anyway, it doesn't seem like 'patch' itself is the problem in this case: the alternative flags should work for BSD Patch as well. Though I'm still waiting for confirmation.