From nobody Thu Oct 2 16:47:48 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 4ccyQX5hVGz69XPY; Thu, 02 Oct 2025 16:47:48 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ccyQX4ndZz3lgC; Thu, 02 Oct 2025 16:47:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759423668; 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=hqS5lR0zd325fNSE5HM4U76nMmV1oBIx5a8l8yMAMfg=; b=nLHWP0g/CdI5YHuwA4mRTdMaqTkom+eZn+EDlLSA67gou4jgvXc1NIiKbVDUjIXQtc93aj J7dlZ38z/CFmKkFzwwi5tVPW59MLsD+zG2HcTsKQRXvSkNMj13FpUC7F8a6/jWcjpHQLuf 4SHBTrfyhth9ZTYbZIDHfzBZcnatNDfAHU57ruUWjA7JFWqhGWhnkRKB6ejf7UdJsEBT37 RvwSGeZpJ5iHvccdLs30e8wnTLgIfWQusIE7eyfsf3I79REXRddNSjIru1tUcYBWnxqKYj r0tKj2jMWiKEHQQS1JGkHhVFT06hgBqfYEQcOgyYIoz/3MOnZ/L0d5uOrDtzSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759423668; 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=hqS5lR0zd325fNSE5HM4U76nMmV1oBIx5a8l8yMAMfg=; b=Oh1sUxVHf9+JwgBVWSGW3MybGKxle/V398bWYQoSXxm+Q1JRGWI7yJBxZkBgJqdAuW5cnj DPfCfcVfhp7sxCaq7e7K4ZYt4s2cgADufstzb9P8qHD9r6kQD9zJSytyds2oBX8IKi0XAx rFDk5sLI23LMz6z1uNYWCKOLyBpDCjGJ9WCveqP8Ma8pJPJtHOPn4U4Y30kcQshTiB10Hy xgq3Tf57ihcFyhh4XXbC6J9/vQP9/Iu42GZMukoHmyvjZVd8uPdtZah+YdxNS9zZSsEt86 JaXIQdPbVOIBLNZHeN3iBrkWBhdJySFtUdib8m9mK44R0PwoEtJfwefiBudNjA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759423668; a=rsa-sha256; cv=none; b=Js8x6fnlwUz9stEC3FwIH+Yb9rRE/w40o5ntVcnf/J1x3XOUSF37XnN3v6Q+44kIgBCfpw 7ct7HFbDAF3fiPxMs2rq7ywFLPoI96zvZYlyovN7iqgGzvyCHQLz0Kzc/XS4OTpGWa9cAb HUn8DE/Urklf0Y2Lr19Ni3r56WskKRwlRT3HudgxK9IQFsk8hajiEzYkpnNfF080YyHemh y0BWE5E4eDkBPYdkWGOOgrstzSI/bdW6Z/tVlTbcIdYE7ZvmRICNMn3yBJKf7jboNwSfcH XhwJIj0hkyEA37jY3qcJdQtjXBRHlBpyAfETOItcxYtgdEubBRVubUJtrXPMmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4ccyQX3D2Pz1G3; Thu, 02 Oct 2025 16:47:48 +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 592GlmUq008581; Thu, 2 Oct 2025 16:47:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 592Glmt2008578; Thu, 2 Oct 2025 16:47:48 GMT (envelope-from git) Date: Thu, 2 Oct 2025 16:47:48 GMT Message-Id: <202510021647.592Glmt2008578@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Joseph Mingrone Subject: git: e57d72a7f35c - main - mfc-candidates: Improve branch detection and repository handling 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: jrm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e57d72a7f35c3fc80dc9ac744056b2354b1be741 Auto-Submitted: auto-generated The branch main has been updated by jrm: URL: https://cgit.FreeBSD.org/src/commit/?id=e57d72a7f35c3fc80dc9ac744056b2354b1be741 commit e57d72a7f35c3fc80dc9ac744056b2354b1be741 Author: Joseph Mingrone AuthorDate: 2025-09-22 18:18:20 +0000 Commit: Joseph Mingrone CommitDate: 2025-10-02 16:47:26 +0000 mfc-candidates: Improve branch detection and repository handling - Use git to detect the latest stable branch rather than hardcoding it. - Handle the case where the script is run outside a src or ports repository. - Fix a pattern to match .git instead of *git. Reviewed by: andrew, releng (emaste) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D52681 --- tools/tools/git/mfc-candidates.lua | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/tools/tools/git/mfc-candidates.lua b/tools/tools/git/mfc-candidates.lua index d2865a892971..a1420dc726da 100755 --- a/tools/tools/git/mfc-candidates.lua +++ b/tools/tools/git/mfc-candidates.lua @@ -129,16 +129,18 @@ local function main() local author = os.getenv("USER") or "" local dirspec = nil - local url = exec_command("git remote get-url freebsd") - local freebsd_repo = string.match(url, "[^/]+$") - freebsd_repo = string.gsub(freebsd_repo, ".git$", "") + local url = exec_command("git remote get-url freebsd 2>/dev/null") + local freebsd_repo + if url and url ~= "" then + freebsd_repo = string.match(url, "[^/]+$") + freebsd_repo = string.gsub(freebsd_repo, "%.git$", "") + end if freebsd_repo == "ports" or freebsd_repo == "freebsd-ports" then local year = os.date("%Y") local month = os.date("%m") local qtr = math.ceil(month / 3) to_branch = "freebsd/" .. year .. "Q" .. qtr elseif freebsd_repo == "src" or freebsd_repo == "freebsd-src" then - to_branch = "freebsd/stable/14" -- If pwd is a stable or release branch tree, default to it. local cur_branch = exec_command("git symbolic-ref --short HEAD") if string.match(cur_branch, "^stable/") then @@ -147,6 +149,11 @@ local function main() to_branch = cur_branch local major = string.match(cur_branch, "%d+") from_branch = "freebsd/stable/" .. major + else + -- Use latest stable branch. + to_branch = exec_command("git for-each-ref --sort=-v:refname " .. + "--format='%(refname:lstrip=2)' " .. + "refs/remotes/freebsd/stable/* --count=1") end else print("pwd is not under a ports or src repository.")