From nobody Fri Sep 15 15:15:55 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 4RnHnp0Rhhz4sndP for ; Fri, 15 Sep 2023 15:15:58 +0000 (UTC) (envelope-from jbeich@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (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 4RnHnp00zWz4RCT for ; Fri, 15 Sep 2023 15:15:58 +0000 (UTC) (envelope-from jbeich@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694790958; 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=Ec8Zx6Y1nx7c4d0mJe9VW+9vb4sABWTZXlexeK7SMtA=; b=XzM5ke9URlfwjHSVPiOjvJyidcPdax67uNjD+TR7M/pWydwxLhz72zTsa5UWt4oGlQBcpl +/jvcdiFolR2xWBsAnS293i/fa0fgIJANbNdRsTlkzFGQC0W8oRsU8UOiR2O5LJsdSXagg vdbht8JfF9J8dA/SIPNlS87x1WuWxITWut3foKjYw49Ct4ko/y0hOlRBM0EvW2fnpevsJY pxpr02o0bdSYhT/qx2Udmze4xnBCNZD1Ty0hk50RGrYYlebubYIJbCF81yyJfNs1XKBKPS TtxOs9aLnyGyQ4sO1I+8UB8p1yXxa9+7cVosPq/kkh8yAi0CVi9i6X98pJNGUg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694790958; a=rsa-sha256; cv=none; b=ZVE44Zkmf6N4FmJFXHZzUGn95BUwam6cSbLejzTgwG/Gd4C15HVYJuR/Eu3utAQ99HvX0P L+BaTr7Mqvy3N6vJ9Fwe8osQFT1ZPGTVFad6M8FnCu0FbnSH9PAVccT+2Xh3Bzf6h74fOQ B1POIFkFhGhb4tmrSb6S8YkKYRqpCKwq0Tz3NKPF8Qxn258i9jxjCRjzKMcP/vNImOXylZ CgDOC7QooelOTNXJNTrnDSp/ebCEieAN5xfvBn24mtUmDFlh7Y1y1ISZ5LBze0lBpMLPOK GNifzE8+JOCNJRIKsgziDVGWKy7r9n9dR9I5c9bNnNrGUPdicFha4zrOiiQM4w== 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=1694790958; 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=Ec8Zx6Y1nx7c4d0mJe9VW+9vb4sABWTZXlexeK7SMtA=; b=HcWarCSEkUcOO9thjB/3U+je7gWU85wtsoF9mTEVUkHaFn2lI70QlU1OU/9yl2syxKSWdQ 3dilCAIpkVDSBua0BexUIpw7X583eeqxxaceiCyavY379n3muCMB6b/d0FDloXmXH3sXeq aw2RdPqt+91UPMUJ5IpqvZ8DCFE447NFQ9eX3ETw6t7TI38sRIaS+zaABzzLS/KLteSf6d UvhLMWVFEOnvLgc+QzZ0oWWiIfWTGqIcOl8X3yx+eyvarOc5ogGgizanO8GJBgdMxGCd5/ neTMM0Z3dZpu3pFX93mWV76szU3TBKTkOBaOPMPu7UiaGO/bS1U+947ECeZ20Q== Received: by freefall.freebsd.org (Postfix, from userid 1354) id E29D3FEDE; Fri, 15 Sep 2023 15:15:57 +0000 (UTC) From: Jan Beich To: freebsd-ports@freebsd.org Subject: Re: problem with git-pull In-Reply-To: (Matthias Apitz's message of "Thu, 14 Sep 2023 10:57:13 +0200") References: <7cot-21li-wny@FreeBSD.org> Date: Fri, 15 Sep 2023 17:15:55 +0200 Message-ID: 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: > El d=C3=ADa mi=C3=A9rcoles, septiembre 13, 2023 a las 11:40:57 +0200, Jan= Beich escribi=C3=B3: > >> There are but not officially[1] supported by ports/ e.g., >>=20 >> $ rm -rf security/wpa_supplicant >> $ git checkout origin/main security/wpa_supplicant >> $ git commit -m '[local] security/wpa_supplicant: sync with "main" branc= h' >>=20 >> or ... > > Thanks, Jan. > > I've tested as a dry run for the next time your first proposal: For a dry run use a checkout that far enough from "main" e.g., $ git worktree add --detach /tmp/test origin/2023Q2 $ cd /tmp/test $ rm -rf security/wpa_supplicant $ git checkout origin/main security/wpa_supplicant Updated 3 paths from b36253a767e7 $ git status M security/wpa_supplicant/Makefile M security/wpa_supplicant/files/patch-src_drivers_driver__bsd.c M security/wpa_supplicant/files/patch-src_l2__packet_l2__packet__freebsd.c Note, "rm -rf" is a workaround for Git not modifying files that don't exist in the target revision. It's mostly to prevent orphaned files from breaking build. > > $ cd ports "git fetch" maybe needed shortly after in order to update "origin" i.e., discover updates on the remote side. > nothing to commit, working tree clean > > What is the purpose of the above 'git commit ...'? It seems to not have > any effect. Avoid many future Git commands being blocked on dirty index e.g., $ git rebase origin error: cannot rebase: Your index contains uncommitted changes. error: Please commit or stash them. $ git merge origin error: Your local changes to the following files would be overwritten by me= rge: security/wpa_supplicant/Makefile security/wpa_supplicant/files/patch-src_= drivers_driver__bsd.c security/wpa_supplicant/files/patch-src_l2__packet_l2= __packet__freebsd.c Merge with strategy ort failed. $ git cherry-pick origin error: your local changes would be overwritten by cherry-pick. hint: commit your changes or stash them to proceed. fatal: cherry-pick failed $ git format-patch -1 --stdout origin | git am fatal: Dirty index: cannot apply patches (dirty: security/wpa_supplicant/Ma= kefile security/wpa_supplicant/files/patch-src_drivers_driver__bsd.c securi= ty/wpa_supplicant/files/patch-src_l2__packet_l2__packet__freebsd.c) $ git am --abort