From owner-freebsd-git@freebsd.org Mon May 3 11:34:56 2021 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5BC5263000B for ; Mon, 3 May 2021 11:34:56 +0000 (UTC) (envelope-from rene@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 4FYgr027mlz4kGf; Mon, 3 May 2021 11:34:56 +0000 (UTC) (envelope-from rene@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1620041696; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rkjx7Ml7MNbNx1+I7mkCy5Ni+nXWYA6dAhWHDIy+KXc=; b=Ts8U2lJuncnJXB7wLTKGh6jyLDukvhm71zJq2K1er3VUeVKyBGdjD6jlwIY120uB2xGS9h Tq4Ld0zFXzglJ0dnop/SGvo2lzZ563mN0IAr610RrER2Hk0Tpn/UrHSD0tHcIprCZdNPtG DTTFcN6Yy5Ea4TH+YBPX0fpIMiy8rStsiSe5a0OmV3AGkJBpibSoUT0ahxWoDA6/nF8Sik ekxMth7twjboJT+CLng2SGQre2Bp7U4YVe8K4h4N5YPu1n6IAogVRfmHpR/RAouNeKbcja m2AvoMu3DBJuD64uqvaWV0eXYZvi60GPOYin9EeFtwahpCsxlRyUXRrjSBJq0g== Received: by freefall.freebsd.org (Postfix, from userid 1185) id 3158B10D41; Mon, 3 May 2021 11:34:56 +0000 (UTC) Date: Mon, 3 May 2021 11:34:56 +0000 From: Rene Ladan To: Matthias Fechner Cc: freebsd-git@freebsd.org Subject: Re: Script rmport shows error message Message-ID: References: <8613e467-9408-527f-d8f0-81a6db0bdce9@freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1620041696; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rkjx7Ml7MNbNx1+I7mkCy5Ni+nXWYA6dAhWHDIy+KXc=; b=J1uf3IGSmnJLXg9JA64ANfsoYtnOMzDhDoROlEgl2596Ip42zaLLCGyUx9po7sK0Ok2aF2 RAcF7wZQzB1xKMBBBzestoo3/BAhcIJkhgGTvAHNzNWtFUULltZqCdN/X1PV1kSKvyLrx5 Zwnux/tuLgTB/P81hUFaovCMThP2eQ594bDa943xcQAAMjuK67TOtzh3ku6OYwiKLs6pXh CPmLjR/IAFegporA2ZeYFH9GMSPBIUahlfWnZArHkRwgjlvdNqeAv9aHKsvkkq5+vcC9QI 1RO6/naBDurUrQREYvrU/AKtyn0wWEbJyuhpnc6N09jtRhv8nAzLO8jV3YnqDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1620041696; a=rsa-sha256; cv=none; b=ZCPoD6NNaPjulDOgEE8lMtHMQsj2hHJG+2tQ76/+XRe8KT3bjKyL4iaJGSxhUqJ6bl73br lTR6F3VW/XitBVr7xND6pOkpcO/w+Y/ZLUQdjolWcDY+5pcddnAnLN5Gj6yL22rBgmGOMC 8lV13Oq4nRW5rCgDCBA82cK7apNQfOC2odZEXPm9mr0tvZsZrZX5SomDlpnF10jYh6s5jr IosWbP7IYJgaMSLjC9gyMHFapLNEiD9G1JoiZHFize5IWj79Hp0rTfzk7oWHUNBjDkv+vj 6678hXYiaYVlqk0OfTTJo3LBEEHkawM6c7tuLu/U+o13rDtnbK+YM6WjR+aryg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 May 2021 11:34:56 -0000 On Mon, May 03, 2021 at 10:37:15AM +0200, Matthias Fechner wrote: > Am 01.05.2021 um 19:17 schrieb Rene Ladan: > > It might indeed be because you have a remote it does not expect: > > > > if ! ${GIT} diff --exit-code remotes/origin/main ; then > > ... > > fi > > > > Here I have: > > % git remote -v > > origin https://git.freebsd.org/ports.git (fetch) > > origin git@gitrepo.FreeBSD.org:ports.git (push) > > I think this should be fixed in the script, as the documentation here: > https://docs.freebsd.org/en/articles/committers-guide/ > > is using the remote alias freebsd and not origin which I think was a > very decision. > > I modified the script now locally (in a tmp folder) and removed the > obsolete ports. This sounds like something upstreamable. > I also saw a problem with the question if I would like to tweak the > commit message. > I told there y but it just had not shown me the commit message to modify it. > > I had to manually do a: > git commit --amend Yes, the flow is somehow broken if you choose yes but I don't see why. René