Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 30 Apr 2023 11:41:25 GMT
From:      Rene Ladan <rene@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 021979f6cf74 - main - Tools/scripts/rmport: try to fix flow for amending the final commit
Message-ID:  <202304301141.33UBfPAE046174@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by rene:

URL: https://cgit.FreeBSD.org/ports/commit/?id=021979f6cf74e131e66ac7304fb53956df05cfe4

commit 021979f6cf74e131e66ac7304fb53956df05cfe4
Author:     Rene Ladan <rene@FreeBSD.org>
AuthorDate: 2023-04-30 11:18:56 +0000
Commit:     Rene Ladan <rene@FreeBSD.org>
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
 }



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202304301141.33UBfPAE046174>