From owner-freebsd-git@freebsd.org Mon May 3 08:37:17 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 C88A262B82B for ; Mon, 3 May 2021 08:37:17 +0000 (UTC) (envelope-from mfechner@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FYbv15MJkz4bHg; Mon, 3 May 2021 08:37:17 +0000 (UTC) (envelope-from mfechner@freebsd.org) Received: from [IPv6:2a02:6d40:36f3:4201:f062:5a7e:7354:11bf] (unknown [IPv6:2a02:6d40:36f3:4201:f062:5a7e:7354:11bf]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: mfechner) by smtp.freebsd.org (Postfix) with ESMTPSA id 6014524FC2; Mon, 3 May 2021 08:37:17 +0000 (UTC) (envelope-from mfechner@freebsd.org) Subject: Re: Script rmport shows error message To: Rene Ladan Cc: freebsd-git@freebsd.org References: <8613e467-9408-527f-d8f0-81a6db0bdce9@freebsd.org> From: Matthias Fechner Message-ID: Date: Mon, 3 May 2021 10:37:15 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.10.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Content-Language: en-US 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 08:37:17 -0000 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. 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 Gruß Matthias -- "Programming today is a race between software engineers striving to build bigger and better idiot-proof programs, and the universe trying to produce bigger and better idiots. So far, the universe is winning." -- Rich Cook