From nobody Thu Sep 28 13:59:08 2023 X-Original-To: questions@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 4RxFTL3wV7z4tpVv for ; Thu, 28 Sep 2023 13:59:18 +0000 (UTC) (envelope-from listac@nebelschwaden.de) Received: from mail.worldserver.net (mail.worldserver.net [217.13.200.36]) (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-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "*.worldserver.net", Issuer "EuropeanSSL Server CA 2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RxFTJ0c8Fz3Qv4 for ; Thu, 28 Sep 2023 13:59:15 +0000 (UTC) (envelope-from listac@nebelschwaden.de) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=nebelschwaden.de header.s=1687803001 header.b=o8ebPngy; spf=pass (mx1.freebsd.org: domain of listac@nebelschwaden.de designates 217.13.200.36 as permitted sender) smtp.mailfrom=listac@nebelschwaden.de; dmarc=none Received: from postpony.nebelschwaden.de (v22018114346177759.hotsrv.de [194.55.14.20]) (Authenticated sender: sendmail@nebelschwaden.de) by mail.worldserver.net (Postfix) with ESMTPSA id 306D61E0B0F for ; Thu, 28 Sep 2023 15:59:08 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=nebelschwaden.de; s=1687803001; t=1695909549; bh=Wsm+53kRpj7FXnAHkjZ7X0DSPOtl+98qH3c0+JnyfL0=; h=Date:Reply-To:Subject:To:References:From:In-Reply-To:From; b=o8ebPngyW1yd2fAfbePCcjbKzO2EdG5H9ulkbf+SlhgGEDya38AacO7cztSJLEio/ FbN5wlOvVCPG7efdK/rQjpCSAwP0mlq/v8SGH1BQa10n+Wo3c15BVkpF/245F2bgjx TXlG120lcMzzky1LjoxcOalNewDCRl7aiHb7XWFZWz5l1sy41rVLKj6GG8m3TbDsnq CCGcpC34oKWewGdOxi34XdF7WqTEn12TXo+ZawLnIhnzm2SsCTwS+e3wsyeRh7bfkE SEimztapGMsOC3SjkqKLv5y76FhZ9mu8C5NJQWnHulB2J3FOTY/31KSoXZ5t+s0fgp q3p5A8cWGSrGQ== Received: from [172.16.37.5] (kaperfahrt.nebelschwaden.de [172.16.37.5]) by postpony.nebelschwaden.de (Postfix) with ESMTP id 6EE321139E9 for ; Thu, 28 Sep 2023 15:59:08 +0200 (CEST) Message-ID: Date: Thu, 28 Sep 2023 15:59:08 +0200 List-Id: User questions List-Archive: https://lists.freebsd.org/archives/freebsd-questions List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-questions@freebsd.org X-BeenThere: freebsd-questions@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Reply-To: listac@nebelschwaden.de Subject: Re: resync ports? Content-Language: en-US To: questions@freebsd.org References: <6C137DA9-2BF8-49EC-8086-CCDB3A3E64A7@gushi.org> From: Ede Wolf In-Reply-To: <6C137DA9-2BF8-49EC-8086-CCDB3A3E64A7@gushi.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Spamd-Bar: -- X-Spamd-Result: default: False [-2.57 / 15.00]; SUBJECT_ENDS_QUESTION(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.98)[-0.977]; R_DKIM_ALLOW(-0.20)[nebelschwaden.de:s=1687803001]; R_SPF_ALLOW(-0.20)[+ip4:217.13.200.0/24]; MIME_GOOD(-0.10)[text/plain]; RCVD_IN_DNSWL_LOW(-0.10)[217.13.200.36:from]; XM_UA_NO_VERSION(0.01)[]; DMARC_NA(0.00)[nebelschwaden.de]; RCVD_TLS_LAST(0.00)[]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; PREVIOUSLY_DELIVERED(0.00)[questions@freebsd.org]; ARC_NA(0.00)[]; HAS_REPLYTO(0.00)[listac@nebelschwaden.de]; MID_RHS_MATCH_FROM(0.00)[]; TO_DN_NONE(0.00)[]; REPLYTO_ADDR_EQ_FROM(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; MLMMJ_DEST(0.00)[questions@freebsd.org]; DKIM_TRACE(0.00)[nebelschwaden.de:+]; MIME_TRACE(0.00)[0:+]; FROM_EQ_ENVFROM(0.00)[]; ASN(0.00)[asn:15657, ipnet:217.13.192.0/20, country:DE]; RCVD_COUNT_TWO(0.00)[2] X-Rspamd-Queue-Id: 4RxFTJ0c8Fz3Qv4 Thanks for the link! git stash seems to do the trick - maybe in conjuction with a prior git reset, I will have an eye on this Am 27.09.23 um 22:12 schrieb Dan Mahoney (Ports): > You’re looking for git reset —hard > > > > Git - git-reset Documentation > git-scm.com > favicon.ico > > > > -Dan > >> On Sep 27, 2023, at 12:41 PM, Ede Wolf wrote: >> >> Hello, >> >> I had to make a change to a makefile to make that port compile. Now I >> am wondering how to get the original makefile back, in a way that it >> is controlled by git again? >> >> Somehow I expected git pull to work like rsync, but it is obviously not. >> >> The question that emerges, is there a more resourcefriendly way to get >> my portstree back in sync with git without a new full checkout? >> >> Thanks >> >> Ede >