From nobody Mon Jul 6 20:03:12 2026 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 4gvFfF2Rqlz6k6Yc for ; Mon, 06 Jul 2026 20:03:17 +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 4gvFfF1mGXz3rNr for ; Mon, 06 Jul 2026 20:03:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783368197; 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=brzZ2YaDqe3mN7RLUau41na4JIyTjsoebLtT+VMOKkDuSwYFlc5bPfinV1zH1YjKx+LH/P YVPb+exnIEDz2VddZj9w9bJaJQb4XS/f4i0choQUT3b33odyH6uu8kozlMwZXTeKsc/5zM 3c5RvHQIFGtRB+pZbAjNnjYeFwimeuJjYHVE2KAhA82jkdS/Jplf9UUpzl+OYgdUYxyfjx wnJRdV1ijLQkbtTpjZ2dnRJ1+9LnyeztHwrpu+/WRushCDwyeaF/78AHocqfNaGXKG7l+U cCXleFWeo5l3PN1Fu8q6BkZuH3HJoUUtAJlUfkFNSRYHjv3xr5q/EhWLWhFB2Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1783368197; a=rsa-sha256; cv=none; b=roILtumLJTkhAr3Tlh9qPd9liolDqE5Rvb90orpWX2MbV4ZcgF0MTKnWuBL/ywgq3+6nf8 BVL44B5JWNbAJ1oQfVsI8D4aHs24d4I90Qxg0FutikaMNuctFyWWkuGk3fqkXwuF4EXwFl fY9DmTNfaaLToV8P6350uyZKXmKbVaOTTNYDUu6e7BA6d4MKUtW4hCx6DO7k64W9BTUm3Z pJfsU2/B8Dyd+wRCIWxh5vZmqIMegg2gF+a9fwMYDNiDDm5TAy/bpDJ/VLbte+Y+lYMFo7 zWIcFshhw5F7EjQE8m826F3c4BwiLEtfynys2Uw9+62M1WnKTiHGB3Y6i7HCNg== 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=1783368197; 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=hyCcamperBPe1CK1+8Yr1b3HSbj4f7GTwNHOS95fX2YXoOdBuW7W1E4YgdNd+lC60Shec4 hDfjLbGFp2+pKWFAG5qtcRKf+ZeCPgqDQ6Nt8pFsH0r7cuPKgoDQDi3qM6nAHVpfeMcwR4 G3hSIHQDiXmsvcwQRlSwXUag1PQKE5kS+AYT3patplRN3aHPWRr5pR5JRrQhU2T5vc/euZ X1Eby4HLyKkCL7P8/8BDXMVEW/70WlL9ORadFZy1ftW9WFwOkAACnOz2/kIQcyvLzofs0q 9Q1zjyoKBdI9W5xb4LIpHEegsFp5rX4dP6Jo+CsWCmpPFL8Po3XGNWIJqvFG0g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gvFfF0rrfz1HPq for ; Mon, 06 Jul 2026 20:03:17 +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 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 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)