From nobody Mon Jul 6 20:03:12 2026 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 4gvFf822Zjz6k6Nk for ; Mon, 06 Jul 2026 20:03:12 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gvFf81VX8z3qy9 for ; Mon, 06 Jul 2026 20:03:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783368192; 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=JJxpHKVfJSMW99WlJoDKS8DN0DPUBVqNl/oqA5VsfUE=; b=eDpkImfqqAlgsX0rEH2ivKoX9yLL5yZsUbGsO65ljfTHqU1Q1f8kxxQyVjM1ff78asMdSg bvjtUUndQ+XB4+pXDHo0Iy1veuHgs11+FfxvLjdCkun2VzmN+hWJOrrHqCl7hO+ekJyJbc xAin4q7N0mQsPZ8hyFIlnkLKco1OAYDEAXqYho1DmkqY+/GZ6yEXoLSkqwoFPmbuIcMzyv sgd/jZ7Zha4+drsui9P4TfKT2SOjYeSjvlO/l1SGxHHjsk+8esZ2p4bAo9C8lhzDoxpw5o IkqNRH14xmf5nAqhzpazYJFOq/r61WC4wHWUjub7PPHves5LtnqMhLuCMRkrlg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1783368192; a=rsa-sha256; cv=none; b=lJsKeohtaKHLZRSsDf/E/7UXAVHdLa83FQR6VvDB8KYqkKvUCWFpK2YGG1cWqqi84x2Z32 nNXejMuyx+sudCU6GGK+kx/giz1U5NzDk3gOgGUR7/ovN4ULaRUiKNCUlOW4LshR5/Pnld tdF4alRBeIbi5q0jSGl4kmMXCiEseQ7sjd/+VTO2TFsrgJd0gpVn/ZgRlW+bnGkLfT86nO RJJlru1RNou/J1KnAt4kk5T4eGDUySpzBpCnDOXmLf59d/GkvsoKLPMnTyB8zqpL+2gGXJ jZGyzzX/c6R4Kz29nAUfb+GJkXCiI7poafa0DlZCOH9UpqEPQzMeLJ+pmp2+Yw== 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=1783368192; 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=JJxpHKVfJSMW99WlJoDKS8DN0DPUBVqNl/oqA5VsfUE=; b=dkZXtsEOlS3BbYu2qEW9vT00vRdJ1cPDPBLAwqaAA53ouCChPyQa/dqT8aNTo7gz3phsOe iBYGuce0fHGUrGNE2l5Vpq+zQoGslzSbExvlSQUBoWvIos4paCCPlPsSCVDbgmlyUzxEPx Rq75fy9W5ggXaUHwwqybqB7wpgQrQ8e2C/njxjPqRkOmSxLPie3psfjlEnCsJ+MJdUFggQ Q4hPi5UvD7l3JD7qQ3NDo9Do7oZr3xrbKDVNUebBYSLn8Iw7XdxZL2y3/F91kc8bMxH8C+ PyDhYHnUHYOlUo33glDNLGUcWPUGw8hmYj+jv7YNsr+R6SppP/zW8s/q/LRNkw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gvFf80Dxlz1HfC for ; Mon, 06 Jul 2026 20:03:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42f12 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 06 Jul 2026 20:03:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 5f4c87e6503c - main - git-mfc: Allow merging merge commits 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5f4c87e6503cd0e1644b86201eafdb11e7e53b90 Auto-Submitted: auto-generated Date: Mon, 06 Jul 2026 20:03:12 +0000 Message-Id: <6a4c0a00.42f12.300ade21@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=5f4c87e6503cd0e1644b86201eafdb11e7e53b90 commit 5f4c87e6503cd0e1644b86201eafdb11e7e53b90 Author: Dag-Erling Smørgrav AuthorDate: 2026-07-06 19:58:47 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-07-06 20:02:34 +0000 git-mfc: Allow merging merge commits In order to merge merge commits (such as vendor imports), we need to tell git cherry-pick which of the two branches referenced in the commit is the mainline. In our case, it is always the first. Approved by: markj --- tools/tools/git/git-mfc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/tools/git/git-mfc b/tools/tools/git/git-mfc index 181432fad523..c3ff474add3e 100755 --- a/tools/tools/git/git-mfc +++ b/tools/tools/git/git-mfc @@ -358,7 +358,7 @@ def pending(repo, upstream, author=None, baking=False): def cherry_pick(commit, edit=False): """Cherry-pick a single commit with -x. Abort on failure.""" - cmd = ['git', 'cherry-pick', '-x'] + cmd = ['git', 'cherry-pick', '-x', '-m1'] if edit: cmd.append('-e') cmd.append(commit.hexsha)