From nobody Tue Apr 08 11:00:05 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 4ZX3515GV4z5sCf0; Tue, 08 Apr 2025 11:00:05 +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 4ZX35149rwz3rYn; Tue, 08 Apr 2025 11:00:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744110005; 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=Fm/4oNkwoCFeA3FEaXGvTSQJUHISy1SkGrpeGC38VKs=; b=l2I0YuPkEr3QE/GtlyvJnB4ZtsnhPMloubw1goXddDF2H5UFr2x/O2/3xcKHHTKx8brAqR v7ETppxKiQRA95cTOeGjDnlxcQTGX1yFVIAZbXtuBJg571ipNlxOXa/MzuXyilNEYUAgJr K+MDa+Ydnzzs/IvIaIk3pq6YnYZ/ay+uSp4aJ87JH6mc/0IBKFPJ99VV104et1hz92sjIL DwO5SvtwXKA+/K1G0dT2b3prwwJhglkyFwhuhaNN5odt83pXZ2GLqvMmEm4w08w/fuWWG8 PaXSbjcELZP3oSbpTGz/RXvxYF/I0Qu8Qqb5jporkltks72A2F+sZjQ/G9+OLw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744110005; a=rsa-sha256; cv=none; b=LQKL+I5DdkIC5D5d29tBRF0IgKhuPXaY1I5tdufiqnCWI9lGgmwkfC5QpiphXjQwiaei6b qR3+m8MUI/mkVXpwRPu5+skZ7tQSkU0XYwtegulNNfs2YLhxxB9klDrzjbKqL/sp6SFwUD UUB/nU5hTwlzO6uSgBeT8SkTc5/YdLTANtUICtd2CE7IO3AsK7mQqujHmIAYvYiBhEb5I+ 4gKiIfCffL9UCFKrv4BA5UVzKf0rjYOVSvCtOllIw2hlULQ9pYCaq4CNnHC6VV7F+P+uM9 mrfEiTW4VUPrCpnl5Z0xcGpv39cWoKTuLDCPY7fxGnTXRwAvo7wklMtqg3Y3ag== 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=1744110005; 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=Fm/4oNkwoCFeA3FEaXGvTSQJUHISy1SkGrpeGC38VKs=; b=e360vjHQbPQ25y4tV1BfNRCGHMkpMinE/CmY/x3PdTvmrvacWxgh5xHVUjS98Zv6uLbKy5 p8Bums7y/owuBFPGmrmKG9isWRUAFTEdERPbkNIRkX+mc2qT+odExli5dMbGeJy+k8dp+T 5n4B6bp5PAg4yKEBvEd0Sa/4Wax/qjGd4g0pbYQrRp5tGunv2yvT4Yh5soO5HboXDpOcLY tJ1YzIafHvspazI/bT7Ptn6jddYqTq/fdmyCc0Zw3nsnQHyJpzknsmuFsDZdTFk2iVKexa b+Xh0ksaTAzJRSpyGp3WGCpjEJne1cmnS9g1HGZ2EdUSQ86PE9pAiKQsR+2C0w== 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 4ZX3513ctyzDFj; Tue, 08 Apr 2025 11:00:05 +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 538B05B2024656; Tue, 8 Apr 2025 11:00:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 538B055r024651; Tue, 8 Apr 2025 11:00:05 GMT (envelope-from git) Date: Tue, 8 Apr 2025 11:00:05 GMT Message-Id: <202504081100.538B055r024651@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: d937ddacc65c - main - Revert "git-arc: Add stage -n to not change the branch" 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: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d937ddacc65c8dfbb9f4df4a520f8f60ebe6358f Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=d937ddacc65c8dfbb9f4df4a520f8f60ebe6358f commit d937ddacc65c8dfbb9f4df4a520f8f60ebe6358f Author: Andrew Turner AuthorDate: 2025-04-08 10:59:44 +0000 Commit: Andrew Turner CommitDate: 2025-04-08 10:59:44 +0000 Revert "git-arc: Add stage -n to not change the branch" It shouldn't have been pushed This reverts commit 1c6170d7712265beecb318309ec5afaddbcf350e. --- tools/tools/git/git-arc.sh | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/tools/tools/git/git-arc.sh b/tools/tools/git/git-arc.sh index 7d2387565b9a..b49721159799 100644 --- a/tools/tools/git/git-arc.sh +++ b/tools/tools/git/git-arc.sh @@ -654,15 +654,11 @@ gitarc__stage() local author branch commit commits diff reviewers title tmp branch=main - change_branch=yes - while getopts b:n o; do + while getopts b: o; do case "$o" in b) branch="$OPTARG" ;; - n) - change_branch=no - ;; *) err_usage ;; @@ -672,12 +668,10 @@ gitarc__stage() commits=$(build_commit_list "$@") - if [ "$change_branch" = "yes" ]; then - if [ "$branch" = "main" ]; then - git checkout -q main - else - git checkout -q -b "${branch}" main - fi + if [ "$branch" = "main" ]; then + git checkout -q main + else + git checkout -q -b "${branch}" main fi tmp=$(xmktemp)