From nobody Thu Oct 31 14:58:14 2024 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 4XfRvB54hDz5br3Q; Thu, 31 Oct 2024 14:58:14 +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 4XfRvB4MNYz4GBZ; Thu, 31 Oct 2024 14:58:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730386694; 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=G0ebr8eKJNJEiztzkJb1IZrS/K3qEJWe6cWZLuJ+zZ0=; b=W7DrvWuRLwLXrg4836rgP7bfzoHu5y5h3aJqbQlsOmyZkLWcnS5IbkOJmpPVGsL/lYbQ6f Ahq3+EklIOB2E2FVEp3SsYviGJUrlovHGdU+dMOkaKiOwOSjpgE1OySJTPrDQ06f/dz+Js Bp7J1yvAg6/U0SUOdLF8X1nAunSGXXQ5izepN/w5xPHGo98ewQePo0hDEPOkK0Y26hf1ct VLa+SMd5ge993fSeNuZaV5iVfoFX5/QmpCTvrdr04hwMmJYetgOcXT/hDhFgHXsNCRsSQw ez1j6pqPr75yh3WZQNuIzWFpBGauNUSgs+S749MH6m1GWZxkOFk+xyz4kFiSGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730386694; 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=G0ebr8eKJNJEiztzkJb1IZrS/K3qEJWe6cWZLuJ+zZ0=; b=Rq0oV2T9+7wkVZJitYimNgQ2dBhaVzWgLUGbADmzcl0tQ/loRAdVaghVKCbQhbTqvuWdGj XN3xRtUEeDlp5yJoGFaT2rSimg4YaYYBNRlhM5T77Gct8qV/c+cp6aTsmmx2aLiLR6PTEi oOihyJ2POQMdST9WfUwZgd2rQALwkW167a4ASLNa3VGQKMFhcjQJ8a+H2J1fVBjYKdO/zi zeNdqXl5QPkTS2fbOi80sTIWF2b0FM+VWwQ2bzTiqlYUAnFdUQg43jBsS/9EZAW1TOnibd 5cDAz1DrwBOYoloqBAuYs5U1+wzoQ7UM2aFU8cbSvmY2/m6IbfHI2USYM3ZKmw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730386694; a=rsa-sha256; cv=none; b=gmeoTLPS5MdWG2tDqZ0D2H5XkwfDerJobiEguQ03fwqT0EC2dwlTq70b27LIOl7D3hq85q kK4g7jx+W6FqFa+veIcAHrP2d5hBx6N34xOIFfQGKFgTjphP6iN8/U0OBFsltEHNZZp5PX +QPaiJHIn6b3QmwOsFMZrx4OB019QskLZIHCaNXsKuIpOf3WraAg5GOBuMqlf1f7aCGXBp LY2VVlAwcLe2FoiuZ8zcXmLSfDvowZToManFLDYEYtt17sGGGqV/igXxQkLx71ETrGaXvI zMwET70ri8T6IkBWZjZp8MDp41pxqblXu0tzPvxuF3HS6W4q6+fMA94gXfXGAQ== 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 4XfRvB3qWmzgJg; Thu, 31 Oct 2024 14:58:14 +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 49VEwEwm043896; Thu, 31 Oct 2024 14:58:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49VEwEKU043893; Thu, 31 Oct 2024 14:58:14 GMT (envelope-from git) Date: Thu, 31 Oct 2024 14:58:14 GMT Message-Id: <202410311458.49VEwEKU043893@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 66a56e411ced - main - mfc-candidates: Support GitHub mirror naming conventions 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 66a56e411cedc4f4891063e0d8f2378231d0d124 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=66a56e411cedc4f4891063e0d8f2378231d0d124 commit 66a56e411cedc4f4891063e0d8f2378231d0d124 Author: Pat Maddox AuthorDate: 2024-10-18 02:03:34 +0000 Commit: Ed Maste CommitDate: 2024-10-31 14:57:31 +0000 mfc-candidates: Support GitHub mirror naming conventions GitHub repository mirrors are named freebsd-src and freebsd-ports. Additionally, GitHub permits remote URLs with or without the .git suffix. Signed-off-by: Pat Maddox Pull Request: https://github.com/freebsd/freebsd-src/pull/1483 --- tools/tools/git/mfc-candidates.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/tools/git/mfc-candidates.sh b/tools/tools/git/mfc-candidates.sh index c232a1ad3345..7af4d29df67e 100644 --- a/tools/tools/git/mfc-candidates.sh +++ b/tools/tools/git/mfc-candidates.sh @@ -33,14 +33,14 @@ from_branch=freebsd/main author="${USER}" # Get the FreeBSD repository -repo=$(basename "$(git remote get-url freebsd 2>/dev/null)" 2>/dev/null) +repo=$(basename "$(git remote get-url freebsd 2>/dev/null)" .git 2>/dev/null) -if [ "${repo}" = "ports.git" ]; then +if [ "${repo}" = "ports" -o "${repo}" = "freebsd-ports" ]; then year=$(date '+%Y') month=$(date '+%m') qtr=$(((month-1) / 3 + 1)) to_branch="freebsd/${year}Q${qtr}" -elif [ "${repo}" = "src.git" ]; then +elif [ "${repo}" = "src" -o "${repo}" = "freebsd-src" ]; then to_branch=freebsd/stable/14 # If pwd is a stable or release branch tree, default to it. cur_branch=$(git symbolic-ref --short HEAD 2>/dev/null)