From nobody Tue Apr 22 18:17:02 2025 X-Original-To: dev-commits-src-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 4Zhr6l3YLLz5t0q1; Tue, 22 Apr 2025 18:17:03 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zhr6l0j6Qz3lcW; Tue, 22 Apr 2025 18:17:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745345823; 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=y7MSVfjxkWkEVC526AWTi1vR+3OHVNezt44OsR5yUaU=; b=QATGWwwKfEvRlJL2MuXHswWGYePk7q69P8DCEShsaQ9BmJa3n6oSiYZmKCkq80Dx1mA4+a soNBVufAwHlfclPdGFIky35/5qw9ASya/JFev3ZDC/X8gEuvDdqYKL9uwssY0LE3wcICNT noRoh/hsDg3WH6a1es5JzqpgFyHDL/HpdxwuWQ1b2+bBZHfCx55yoC9HJI8QWn5wfcTgC4 TeyWIuK9dH7enlI1fWH880Bc4ifWNMEUOlgwqvQ/4qv9HWawrDFTgIYHFP28qWqApEKTx0 gbYDDG8zl/89YvqEZftmJBSbLpBjRvOiQbZuZxatJEGL3rUTmx9ikmd/ZmshcQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745345823; a=rsa-sha256; cv=none; b=kZePZyiprJsEAhysdkcWI8aEHWoq5jHDIRYDuyAC4ZqyFbSi9ffMdafCpg1t9T47dkD84Y fg+Pfg+/VGwc19oIjZT+Hh+KvKVm6lhZBgh8jSInJOLi4UjzxI81sIzlyv2/flqpMyq1q9 uco6u2XJnP4+CoJgdw6FJhEY7NrWGX4dmkjqhW/3j8RoM3CAYGbo6JOCuBxI1pe1Acl5sK nS7UQVG6UEVtpOMmVyhk1jUkJQMgcX+6lj0M1C+WeUD+ED/IgWqo8EjdKmUmhaiupnaqcO pvF3GRpf19AMhgLrJuQ2bTtDgJ4hkbmvKXuleWTWeIB2lvd3IqfrqAyMlwc9SQ== 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=1745345823; 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=y7MSVfjxkWkEVC526AWTi1vR+3OHVNezt44OsR5yUaU=; b=A16KPEpuVNqmsDs6FcE42G41fxtWGgSChl54RkV0tahvR137wZLt+ooePYNikNUUsE+ekW BI4xsAePh8W7p8o/Vakme/GhLT2Fs+hROZJ2nWFCa4f5L2RKvmJ7JGmhbV3/Kh1SHSVOSp EAmL/Dc35M8ekU3vlbBz/r24pgkO0tbXGTsLS+lSXwSKsFY0LJUJ0hW9yktkvk/s/DFM2d vCZnCMPitboOjZFXuhoTyFvVuHZ4do2Xldk8DTqdk+utgsbiovfWXu5lSuuJY0nwNwEsAM YiGoDKVkMdQpObe3UQ94nYJDOSr49N3jAUdyAJLIpTjPK609cXZFdC8tbqnL+A== 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 4Zhr6l0Jw2zTtv; Tue, 22 Apr 2025 18:17:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53MIH2bF094293; Tue, 22 Apr 2025 18:17:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53MIH2TY094290; Tue, 22 Apr 2025 18:17:02 GMT (envelope-from git) Date: Tue, 22 Apr 2025 18:17:02 GMT Message-Id: <202504221817.53MIH2TY094290@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: a1a06bc68661 - main - ghpr: Make init a little more robust List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a1a06bc686615bc4ff32b553ad1193fb30406607 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=a1a06bc686615bc4ff32b553ad1193fb30406607 commit a1a06bc686615bc4ff32b553ad1193fb30406607 Author: Warner Losh AuthorDate: 2025-04-22 16:25:17 +0000 Commit: Warner Losh CommitDate: 2025-04-22 18:16:55 +0000 ghpr: Make init a little more robust Use newer git config subcomands and set the values so we don't get repetition. Sponsored by: Netflix --- tools/tools/git/ghpr/ghpr-init.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tools/tools/git/ghpr/ghpr-init.sh b/tools/tools/git/ghpr/ghpr-init.sh index 3b1d65c56fe2..567148b14716 100644 --- a/tools/tools/git/ghpr/ghpr-init.sh +++ b/tools/tools/git/ghpr/ghpr-init.sh @@ -16,12 +16,14 @@ if [ "$(git config branch.${BRANCH}.opabinia)" = "true" ]; then # Bail if the branch already exists else if git rev-parse --verify ${BRANCH} > /dev/null 2>&1; then - echo "Branch ${BRANCH} already exists, skipping creation" + echo "Branch ${BRANCH} already exists, skipping creation, but rebasing to ${base}" + git rebase ${base} ${BRANCH} else # Create the branch and tag it as the one we're using for opabinia merging. + echo "Creating ${BRANCH} from ${base} to land changes" git checkout -b ${BRANCH} ${base} || die "Can't create ${BRANCH}" fi fi -git config --add --type bool branch.${BRANCH}.opabinia true || die "Can't annotate" -git config --add branch.${BRANCH}.opabinia.base ${base} || die "Can't annotate" +git config set --type bool --all branch.${BRANCH}.opabinia true || die "Can't annotate" +git config set --all branch.${BRANCH}.opabinia.base "${base}" || die "Can't annotate"