From nobody Sat Mar 25 20:34:50 2023 X-Original-To: freebsd-hackers@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PkW661hZ8z41gjM for ; Sat, 25 Mar 2023 20:34:54 +0000 (UTC) (envelope-from yuri@aetern.org) Received: from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com [66.111.4.25]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4PkW656sqqz3nl9; Sat, 25 Mar 2023 20:34:53 +0000 (UTC) (envelope-from yuri@aetern.org) Authentication-Results: mx1.freebsd.org; none Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 105D05C00E8; Sat, 25 Mar 2023 16:34:53 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Sat, 25 Mar 2023 16:34:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=aetern.org; h=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=fm2; t= 1679776493; x=1679862893; bh=5DXbLDLElUO+355/HfuDeQeq81lNnW+W5tR zfN9lwCM=; b=Ek8qOL4HiJ/tAGy6OOvQ5gwflzjSbUVCzU0VfzrRi63I0JDPDcC alD0jlfIj1wjPGcgqyeo9nbjBByJEeMmiR+h9FaEChb7K0KPp4odI+i89hM5KKlP rbn8tQly+zvg3fugu1jK8B9poIijxmQQwKUwWkzOrTt67x8WJ11ff59WP4EHuYSx au1y4lDyxr+b7nNd8LsXxViXXgRNsSNRxYpiojJRvHH8r1Pvbf4d65u3V3G0ixAQ FbebtV+nuOMq4y2fjFbbuS4y8hPiCK3oRtSHjFYS0GzaFKFRFMwEYKyRCQ84epx0 FXqODsIfZsYRy8CTU0d2DTbhmO29E+pv4ng== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=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=1679776493; x= 1679862893; bh=5DXbLDLElUO+355/HfuDeQeq81lNnW+W5tRzfN9lwCM=; b=E epmVFzm7+CcA8ZBspPhAIUjWwlxNhFWIsETIYE+f62M2H6yAta+Zjoj8t62lTrV2 i2t4p9MjWuuZUrCc1up6cOFsOWMv2BoI/7pJc0N5Aa4VmJl6And3Zv8gaxEyj6hP ENW5CmtQka4it4bU1FpESYzGemdDwBo5Y1UiMKdHbqqbZFYi4z/a85VHA7bdZcuW bE8QE1ItIkeqAYX/EHBtBpLH/yg4tYnt0ZycFzmHfls+TJs5n0qvUBrnf/bn1Y14 Vn8uCHz7N9/WkLrLOPqkx1CPR2T9atFZAMOd57iZWVbtTGowaUTQ1kioRedLu0mQ maWWRITH2f2PkbyEyIHcw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrvdegkedgudegvdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefkffggfgfuvfhfhfgjtgfgsehtjeertddtfeejnecuhfhrohhmpegjuhhr ihcuoeihuhhrihesrggvthgvrhhnrdhorhhgqeenucggtffrrghtthgvrhhnpeegheelve euhefhgffgteetffeifffhudetudetuedvhedvhfffvdethfffjeejvdenucffohhmrghi nhepfhhrvggvsghsugdrohhrghenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmh epmhgrihhlfhhrohhmpeihuhhrihesrggvthgvrhhnrdhorhhg X-ME-Proxy: Feedback-ID: i0d79475b:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 25 Mar 2023 16:34:52 -0400 (EDT) Message-ID: <634f894e-02a7-6a03-c28b-c1cc5f4a1402@aetern.org> Date: Sat, 25 Mar 2023 21:34:50 +0100 List-Id: Technical discussions relating to FreeBSD List-Archive: https://lists.freebsd.org/archives/freebsd-hackers List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-hackers@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.9.0 Subject: Re: git-apply(1): error: content/en/ports/_index.adoc: No such file or directory Content-Language: en-US To: Graham Perrin , freebsd-hackers@freebsd.org References: <670cff73-a3e6-8501-b33c-df358149adb7@freebsd.org> From: Yuri In-Reply-To: <670cff73-a3e6-8501-b33c-df358149adb7@freebsd.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4PkW656sqqz3nl9 X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:19151, ipnet:66.111.4.0/24, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N Graham Perrin wrote: > Can anyone explain what's below? > > The .diff is downloaded from . > > > % file /usr/doc/website/content/en/ports/_index.adoc > /usr/doc/website/content/en/ports/_index.adoc: ASCII text > % git -C /usr/doc apply -v /tmp/D38510.diff > Checking patch content/en/ports/_index.adoc... > error: content/en/ports/_index.adoc: No such file or directory > % head -n 8 /tmp/D38510.diff > Index: website/content/en/ports/_index.adoc > =================================================================== > --- website/content/en/ports/_index.adoc > +++ website/content/en/ports/_index.adoc > @@ -11,21 +11,20 @@ > > ''''' > > % > The default value for stripping leading path components is 1, as usually the diff looks like: --- a/path/to/file +++ b/path/to/file ...and it's not there in the diff you are trying to apply. IOW, try specifying -p0.