From nobody Sun Apr 30 11:41:25 2023 X-Original-To: dev-commits-ports-main@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 4Q8PYy0mD9z47htW; Sun, 30 Apr 2023 11:41:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q8PYy0Lt9z4HbB; Sun, 30 Apr 2023 11:41:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682854886; 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; bh=k+GAJs/ntypzUljJ+Hny1b2AQ4EEdbFwFdXYQlttp9E=; b=nm6BAI07/jp1MGzAg2DcjxXNCtFrZ6MzZ/lK5WQ2M9c6YM+uHDuM3OqYTQUJ3FDE3v531p pcy5+31L2dsHpuXkWnm6URkMY2+htCZneCpj8nTAKHQuarO+9YYpjF0XGyZ5aU6AFE1dVK AlbpDThgVPpP/5Z+7+a660FSAH1a+n1oC1aVFWDm/h4RerkiWkX0pIL3XtxAV6NE44OjpI kfjDjzF16wIXwn6bOC8nyHKsjO2pxgfpytajfYTTv+BTfwo/2eJiCmI9/HU9SWvSA/urSP J+qIyulO6FHpibZtJerYAO3NN4O6eZAw8xJA3Po8esFgUZLzSbv1f+jBncyEVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682854886; 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; bh=k+GAJs/ntypzUljJ+Hny1b2AQ4EEdbFwFdXYQlttp9E=; b=jC5vWjSa15eZDiCK6fAtIscvmgv4Sk8JFiuv2Z4fU4/RQFoTeenOGyAY7MA+/3Vo2adKVC 6KieC4O4AMV+uCd2eBI7+8lGD1oPJ0bNCueK6NxyeCx43diTRiAPo5Dfte3Yr0GwLj+4r+ Pgd6AVPRNUb5kH2DQJ1w/rLq0FpDH9e9TmUUmcIOSgqXzIa5YjdIBp4lz6YIBqVXOT9zFc rJh8nJCCv/vW+26oC8cjQxY9H9/ORSZiuKS6x7pWZfuqYYeV3Ky6dr1+bmuml1Zh5y6fC5 dZFvsJQpo6MiBGRRGiHc2xmpu2meEumUwuoPhDtG+ZS+CYHGAZzz7ArmIEXT8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682854886; a=rsa-sha256; cv=none; b=azL3ZPykJNeUNMZ+SF4HP6ydLtush1rcZm/xolXVtl3hxoWTNxXrbb54bPLs7VgTyuZMEp gAEufaM6nvJjFEB9NeLT9bk5BAMGCO2lb108hDWuSDCtFJfWTagzag4kFapTPRr2Vn7R1H 1MbH/oWvcDaTkn9AmaqX94JrWq49+LPp4G42xQw7Hwpl05ofH28cOPSkom/i/6ADappkDU CIPy9qlxeiUybp+DRyK4XldMGUs5XMCcgZIaoL7hFOK9gIJ+rdz4Q9Yigbtqiw6HXef+Ef jC5JupQCh29j/ln0TTBCKMNx3EpTuFpXxEQctSdacXsV7dqZB8OPO5KbOYMzmA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q8PYx6XtBzMgj; Sun, 30 Apr 2023 11:41:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33UBfP0l046175; Sun, 30 Apr 2023 11:41:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33UBfPAE046174; Sun, 30 Apr 2023 11:41:25 GMT (envelope-from git) Date: Sun, 30 Apr 2023 11:41:25 GMT Message-Id: <202304301141.33UBfPAE046174@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Rene Ladan Subject: git: 021979f6cf74 - main - Tools/scripts/rmport: try to fix flow for amending the final commit List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rene X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 021979f6cf74e131e66ac7304fb53956df05cfe4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=021979f6cf74e131e66ac7304fb53956df05cfe4 commit 021979f6cf74e131e66ac7304fb53956df05cfe4 Author: Rene Ladan AuthorDate: 2023-04-30 11:18:56 +0000 Commit: Rene Ladan CommitDate: 2023-04-30 11:18:56 +0000 Tools/scripts/rmport: try to fix flow for amending the final commit --- Tools/scripts/rmport | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tools/scripts/rmport b/Tools/scripts/rmport index e77c96b7306a..f478c5856c2f 100755 --- a/Tools/scripts/rmport +++ b/Tools/scripts/rmport @@ -316,7 +316,7 @@ commit() answer=$(ask "Do you want to tweak the commit message") if [ "${answer}" = "y" ] ; then ${GIT} pull --ff-only --rebase 2>&1 - ${GIT} commit 2>&1 # modify final commit message + ${GIT} commit --amend # modify final commit message echo "All done, check the result and push when everything is OK." fi }