From nobody Tue Apr 8 10:49:03 2025 X-Original-To: dev-commits-src-all@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 4ZX2rH6pj9z5sCB6; Tue, 08 Apr 2025 10:49: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 4ZX2rH4g4Cz3kFG; Tue, 08 Apr 2025 10:49:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744109343; 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=gcoqgp2ARNIvtisfht6LrG9SsZNhA7S8tqgwO7iFUqM=; b=hb4hOvtjH0vD8JtRDVhFZmUlv6QvO+tL0IrTTCI/bS+Om0h9bn3YUUJ6H6jVtPbeMHLcRg LKPZfYvP7/55DJPchogpSsk9GeNjRR6nS2k7OpnYJHcn5PCaj6Yl6j1HdMHLhik8RoQcwJ aoFPkn2xuyZmdmjp886PZeTvi+1eFoeMN+AM2WcQEkYDULbFu1MEHkG3uco8DUaCVqQb3L KHDKzOIC4vEwdWTVfwgjfR1ostszCZEhEf2BzHNtCuMn37Zh7wB3NX+TZE1lHyptTWZwRj +SvxJWhvKv0W/zVQPFk9qww70q/XPo1ySf3f14i2XHCpg1SDX6pPqF9XPWHqDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744109343; a=rsa-sha256; cv=none; b=AaP3sZAS8l8LPo8SPEBFkdWQa2uIe1gGWuEGefjH/ioaNedsFmq4r75T5dJitEaYGr9Yef rygBaJqPeGAsBF3B8QbkQ2+n4/vQCTuwwUbxAcThC2r44jspF94WzO8ROK+C4RTVS4NCUk AeJbvlkRVdoOp3eRDQti95PayJIXcZE+DNJ2GW/bgHEUtuHahoIrJQnIXD7ClfviFarY4e UUAjH+K3m3UrKcKbiKi9t/WHXJP9Ngbit+0kAjesFyh6LJBdjrmIy4hi7aSqKrRro7LTqR cV7eb/42up1HrRkkugjrWsEKUR8FT64PjdRxLYr9ih8k/ZS2jNyQuhcM8Eo1gw== 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=1744109343; 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=gcoqgp2ARNIvtisfht6LrG9SsZNhA7S8tqgwO7iFUqM=; b=ygFqh8BJhCPL69ezPWAHX/J0Xq5pR8Q31oMnaHizQ154t611dqIKN1XiXIZ/gj5F+qkK8F paHsVERGVnMvljfBPIQFgWa9eMofNE4Sv2Co9zL0aiCzMfgNAcV68ylIPqoRYx8T9Acwbb 8TPdf9iu7T/N9MwJ680lcC29CQuZzkWWEmwlnsdKufjUJ5KVVJWnEMmtjT4bbNftPaTbrH MYnoHjEIyU5ZqbEKCvXBKWVNLOGFOUR71p1CPUKvuO/yktgkYyqD3uAwcRFd56wP5VaP2u TrfMn4eBMgAJ80eEpHapfERfolYcudEUrVsxlzeZxo3dFNNiGJv0fJnzMtgYeQ== 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 4ZX2rH46MnzCZj; Tue, 08 Apr 2025 10:49: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 538An3Ij001796; Tue, 8 Apr 2025 10:49:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 538An3Eh001793; Tue, 8 Apr 2025 10:49:03 GMT (envelope-from git) Date: Tue, 8 Apr 2025 10:49:03 GMT Message-Id: <202504081049.538An3Eh001793@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 1c6170d77122 - main - git-arc: Add stage -n to not change the branch List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1c6170d7712265beecb318309ec5afaddbcf350e Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=1c6170d7712265beecb318309ec5afaddbcf350e commit 1c6170d7712265beecb318309ec5afaddbcf350e Author: Andrew Turner AuthorDate: 2025-01-13 05:34:24 +0000 Commit: Andrew Turner CommitDate: 2025-04-08 10:31:43 +0000 git-arc: Add stage -n to not change the branch This can be useful when staging to a non-main branch --- tools/tools/git/git-arc.sh | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/tools/tools/git/git-arc.sh b/tools/tools/git/git-arc.sh index b49721159799..7d2387565b9a 100644 --- a/tools/tools/git/git-arc.sh +++ b/tools/tools/git/git-arc.sh @@ -654,11 +654,15 @@ gitarc__stage() local author branch commit commits diff reviewers title tmp branch=main - while getopts b: o; do + change_branch=yes + while getopts b:n o; do case "$o" in b) branch="$OPTARG" ;; + n) + change_branch=no + ;; *) err_usage ;; @@ -668,10 +672,12 @@ gitarc__stage() commits=$(build_commit_list "$@") - if [ "$branch" = "main" ]; then - git checkout -q main - else - git checkout -q -b "${branch}" main + if [ "$change_branch" = "yes" ]; then + if [ "$branch" = "main" ]; then + git checkout -q main + else + git checkout -q -b "${branch}" main + fi fi tmp=$(xmktemp)