From nobody Wed Sep 13 21:40:57 2023 X-Original-To: freebsd-ports@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 4RmDR161Rrz4spK4 for ; Wed, 13 Sep 2023 21:41:01 +0000 (UTC) (envelope-from jbeich@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (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 (4096 bits) client-digest SHA256) (Client CN "freefall.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RmDR15ZxQz3cqj for ; Wed, 13 Sep 2023 21:41:01 +0000 (UTC) (envelope-from jbeich@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694641261; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=FiXVO7x99gAQXIp8wymyZI57xOMj4nOWFcBlddgOLFg=; b=eR6nFaCsXrUUNXx45eLr4hUkhLLmccPrZ/RNfeKbX2w9l8ZPq8fOgK5TRaX8MvNp5Nk/5n XXdGaBmzR6BGL1ePdSkCMvyyNE42hWvzqIryqeK72lKn965FXY0yVdT0VCB/V44rrKirXZ RZlPciASgVvM2tgsFDTPEjajFEAywWkPl63WM1rbHD4bFEYP+xLLRqbAd5HXTDIRXNFRNr M7OdbPm6ay8Fo0Hk0AyLhYT4fYpwXwv+rPSqqJnzkdvVkUe/V5S9yI6jAuVr+ExSM8a7hW Wf4Z44tpxHvOvgW1AxNjVHN8frJsQoeZMEyvA5xM4QK3XhRPWUc9glHV/K5/QA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694641261; a=rsa-sha256; cv=none; b=o5Kq7wZANHSnpFMYfWM1pl0WL/7yG3QweJFTJnI1HYM5sUib7Ng53a+apxkEl1ybqKOnlw H1lUEPRLWh6vprEWlf30Dz6SrmmgcB7t5R1iwoQborzTfz+cFPQmTF/VeJKV4E+7Wg8F4V +72adWoOLDnYfuUGlBEcqRiAU9wXtfvUZZkgEElmfjFGWSl9GXeBu1IDwjv4OVwlY5SsCC 0EMPiEQHT4rKjxxApQJisZgxr7u38Yh/T8+cmkzUhaB4UZaMD1Pc1Uo5RwuT9q4e/eIx5b bJI93bj471J5k6HejDgOGyNoJ3KRLKA4mfmF3Dp5yAA8e4zqqRqlSryAGK27Dw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694641261; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=FiXVO7x99gAQXIp8wymyZI57xOMj4nOWFcBlddgOLFg=; b=VC6LrPBDU3JgJFF+DsPLumD8sEzu+6tMDdYRXEL1tyLJPeqbG3Bj9aiflnacnGLJb6GZVj llt0pptpqpzAckP2VZBTPZ1Sl6ZMmDHxdRDMIgNgvqmMtd0M/WNhHqgpkr7wtuEzj5oMG/ P4m8wFfOrAb4OosT7XZKmbyNR/PpT7gSl4PJAaZxdAs4SV4vCepUmXD3VjfJMvqFmbJQGO JGgxZAKkRQWkhPoaMkx8nWi3/p3o24Cyj+BqZAEycl352gYbYsRPdhQa2KlQFR52noTMeY e1IshWqV0TGeGpE3uhKvuNWGvi+F/4wLqAgFn5IuAw/znVu8YHYK/zOTo8Pnjw== Received: by freefall.freebsd.org (Postfix, from userid 1354) id 96560A3F2; Wed, 13 Sep 2023 21:41:01 +0000 (UTC) From: Jan Beich To: freebsd-ports@freebsd.org Subject: Re: problem with git-pull In-Reply-To: (Matthias Apitz's message of "Wed, 13 Sep 2023 11:25:54 +0200") References: Date: Wed, 13 Sep 2023 23:40:57 +0200 Message-ID: <7cot-21li-wny@FreeBSD.org> List-Id: Porting software to FreeBSD List-Archive: https://lists.freebsd.org/archives/freebsd-ports List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-ports@freebsd.org X-BeenThere: freebsd-ports@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Matthias Apitz writes: > I wrote yesterday: > >> El d=C3=ADa martes, septiembre 12, 2023 a las 05:42:45p. m. +0200, Chris= toph Moench-Tegeder escribi=C3=B3: >>=20 >> > ## Matthias Apitz (guru@unixarea.de): >> >=20 >> > > but when I now say 'git pull .' it says only: >> >=20 >> > Drop the ".", because: >> > 1. the first non-option to "git pull" is the repository, so you're >> > pulling from the current directory, which makes no sense for your >> > case. >> > 2. git updates the whole repository, which is a good thing[tm] (yes, >> > there are ways and means, but in gereral one wants to keep a repo >> > consistent). >>=20 >> Thanks! I'm coming from a CVS and SVN background where updating only >> sub-trees is possible (and with good intention also normal). >> Without the "." it updated the full tree and I built successful the one >> package in question with poudriere. >>=20 > > This was wrong. It didn't compiled anything at all, because I updated > the wrong /usr/ports tree, not the one poudriere was using. When I realiz= ed > my fault, I updated with 'git pull' the correct tree and restarted > poudriere to only compile one port (security/wpa_supplicant). > The result was, that poudriere detected the (massive) changes, deleted > and recompiled around 10 ports and at the end successfully > security/wpa_supplicant. I don't want to imagine a more massive > recompilation due to changes in infrastructure ports. > > In short: Is there no way with git to pull only one special port > for a recompilation? There are but not officially[1] supported by ports/ e.g., $ rm -rf security/wpa_supplicant $ git checkout origin/main security/wpa_supplicant $ git commit -m '[local] security/wpa_supplicant: sync with "main" branch' or $ git rev-list --reverse ..origin/main security/wpa_supplicant | xargs git = cherry-pick -x -- [1] All types of partial upgrades are under "doing it at your own risk". Neither portmgr@ nor any port maintainer are expected to help. To speed up build use poudriere-devel with -b flag to prefetch packages and rollback the whole ports/ to a matching revision e.g., https://pkg-status.freebsd.org/?all=3D1&type=3Dpackage&jailname=3D132am= d64