From nobody Sun Mar 1 07:48:21 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 4fNvMC3xLsz6TFkg for ; Sun, 01 Mar 2026 07:48:39 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pf1-x42c.google.com (mail-pf1-x42c.google.com [IPv6:2607:f8b0:4864:20::42c]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fNvMC21Blz3V8R for ; Sun, 01 Mar 2026 07:48:39 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-pf1-x42c.google.com with SMTP id d2e1a72fcca58-8274936d2c0so3148210b3a.3 for ; Sat, 28 Feb 2026 23:48:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1772351313; x=1772956113; darn=freebsd.org; h=to:references:message-id:cc:date:in-reply-to:from:subject :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=vTFqQv9A9FpWM1bZcPsUmOCFq+S//eKjMt/CqacZ7pE=; b=Dze1a8WYSCQ70YYjBz/Wp/xeThOnDaJgTZQ36UTgOBaHM285/EvNaD9SEcXm8i72BW 55lK5z70rtcVnJ4ytOroZ73jx3ivFdwPY0lQvY/w2WQCcSWQ+qfTMqnrZZADN4aFnGSf 3tbOeJrkfS8J1/nbft1MvM0krGhhC2nQsoZvctJxXvNWwkStMz5/yimlS+V1k835xroS 9bXeHy42KzW09GKnDny76K4RnuiyqQBMJHQpbGxB77Omb+z/XOll2tnCioziPuD2MvHc wN7f9HhFv9EOHvVfbpQtg4Jh+vlIZqtKs4H0as/n3m0E5fsQa+HssuCTYwPo1FUgTcDv 6d2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772351313; x=1772956113; h=to:references:message-id:cc:date:in-reply-to:from:subject :mime-version:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=vTFqQv9A9FpWM1bZcPsUmOCFq+S//eKjMt/CqacZ7pE=; b=HsHyB7fexvqJPbtR1GpSjAXB0Yy004VnjhcIPu4uPccxkrkHxpoBxcmCAuWaV+XUk6 CCmczpmaPJWMi0tUC9QI8pXCm51YHJu5EA9CaQskL1xi/b/XFgdFsZ6NSe95UdLBprut NZFRL3DLuAfJFyRYdI5pB86IleWLtflo9lXm1+x9PjjWCFOZWkckA9GSKDQYDmyAst81 YgmYnmzLXzB5XkFK5hwfJavioh7fFJfZsfg0jVxtqAvjED7W2US12O4PD6cqaMK8CswJ EXfFaOxRhbBkp+mQ3y8gX+b6gb3DQ7fWttjvh25xBzlIhljHQguzUOMSaWJQqK2DPlGx NzGg== X-Forwarded-Encrypted: i=1; AJvYcCVVP1PFHISZQCfZRUz/MzITNHmLdrNMp73wR3H+zM6NIw0hRdMT7GZM62gQeznnlYDJve5bfMZB3k7YCYu4fidPTjB0OA==@freebsd.org X-Gm-Message-State: AOJu0Ywd35fL435g4dqFRYIvCeoo48j/4JAt8tBvlSlRKF3qTJ+qwgmJ 4KYT5RZTgPz3dZKR7+81oyiG58/q9YS8WlpdczKvtBbTVUU4odsN6wjV/9g3phYF X-Gm-Gg: ATEYQzxkaM8NLysfRhTG9Ym4GvMRXDbxVLe5lVgXNk1TQgys2zYPfJAPbzohMLt/rvx NM2zC2X8PkHmxRoRX+lQLx8QZPHyp3iciAforLUUJoRKeOP5Fhk2yEi2hMDxn4lssclcoZvoaEx pVPwJ8+39xhbL8eJi+m8lD9NoVyudka+0USHVsZ2QgfW+XyS4qm5y+fi4RjvLWChl857VlNS6Nl AOV6ZhLujf7Di2KI7IxAV+B1BCBhJdUXNwWNs4s05YdRWnbZUc1oSPYFDbhyqEMFhmnZMo8ejUo oU9tbzXTZ8t+NfjKFxjWgVLjPoSipiG4vtBBnG8rnnMREDgJjSKunqOQo3cEDsgear25YTMQeGz gwYgq1JAdEX6X0pb9tSngRUXL6jf+eX0PdZcB6LuPkHIeHMKafuSv8A5WO5C0g+a+fjnfyndZCA DKHy23usCVFXMyxZDtRvN7YJjdQTXVcNfP5C3FrKvC938= X-Received: by 2002:a05:6300:85:b0:370:73c1:6a87 with SMTP id adf61e73a8af0-395c3b0dccfmr7398791637.58.1772351312921; Sat, 28 Feb 2026 23:48:32 -0800 (PST) Received: from smtpclient.apple ([185.219.141.153]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3593dda3a4dsm9148013a91.10.2026.02.28.23.48.31 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 28 Feb 2026 23:48:32 -0800 (PST) Content-Type: multipart/signed; boundary="Apple-Mail=_D2E0B433-D30B-44E1-A3FC-2B179EC2CDA3"; protocol="application/pgp-signature"; micalg=pgp-sha256 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 (Mac OS X Mail 16.0 \(3826.700.81.1.3\)) Subject: Re: git: c2dee7786bf3 - main - diff3: Code cleanup From: "Enji Cooper (yaneurabeya)" In-Reply-To: <69a330d5.44fd2.56809847@gitrepo.freebsd.org> Date: Sat, 28 Feb 2026 23:48:21 -0800 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Message-Id: <5A228777-56E5-49AA-9F20-99543F397059@gmail.com> References: <69a330d5.44fd2.56809847@gitrepo.freebsd.org> To: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= X-Mailer: Apple Mail (2.3826.700.81.1.3) X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Queue-Id: 4fNvMC21Blz3V8R X-Spamd-Bar: ---- --Apple-Mail=_D2E0B433-D30B-44E1-A3FC-2B179EC2CDA3 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > On Feb 28, 2026, at 10:15=E2=80=AFAM, Dag-Erling Sm=C3=B8rgrav = wrote: >=20 > The branch main has been updated by des: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3Dc2dee7786bf32cb66cedec226e42e79e= 06457c51 >=20 > commit c2dee7786bf32cb66cedec226e42e79e06457c51 > Author: Dag-Erling Sm=C3=B8rgrav > AuthorDate: 2026-02-28 18:15:23 +0000 > Commit: Dag-Erling Sm=C3=B8rgrav > CommitDate: 2026-02-28 18:15:23 +0000 >=20 > diff3: Code cleanup >=20 > * Order includes. >=20 > * Turn the diff type into an enum. >=20 > * Turn an unreachable error message into an assertion. >=20 > * Remove unused debugging code. >=20 > * Remove some dead assignments. >=20 > * Consistently use 1 instead of EXIT_FAILURE. >=20 > * Turn a return from main() into an exit(). >=20 > MFC after: 1 week > Sponsored by: Klara, Inc. > Reviewed by: bapt > Differential Revision: https://reviews.freebsd.org/D55517 Hi des@, It looks like the diff3(1) code came from OpenBSD (at one point = in time). Are there any plans to converge/merge with that codebase in = the future? Thanks! -Enji= --Apple-Mail=_D2E0B433-D30B-44E1-A3FC-2B179EC2CDA3 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEkHfexGRJ3gYRdA2gGpE5DjPsNJgFAmmj70UACgkQGpE5DjPs NJgJHA//TmBhKFPjNOvztpWtghUfkXE9ZpRmRbhRvcHc/0lupljkuMMiiTz2CVVF 5TvV+JHm83oBAO9pogsoqpjIKxYtvfKgluYSzDlog99bNbFLnNtMv4kEeW1smM9I m2aDvwEF+sNHGUBD1OoJ51d/aMpA8+WAN/8J9qiGtpnt3/IysusZVxhG/Uz5kgmL qhptseL6bVtN8JwK+KJbKaswOPVR7hqVE10mY9umNzjIPap/FKTObmKBl4JURQdy od6uIzNml9ZuYNYBcHGSfnbXDihB2bLZnyHkARLDUyz9QOJdP5gDxzm5bVqdFCrr u0zMQHD5jEV8YlG2CL7QGCEQKZ0oztO9qLwwtL36YOWeaVERAMR/J+a/x8QTUKQP gUa4eg730bdi/w947wNuxhusPyQ7W7h5OjfXAt+MJv1JOahdkZzXBNHycH0gcGXT NEdgKf2KMvYltUb8FznJMFWNlJAA7Pc7KdrTy2+LSHBa+DTEd5WNn4b2OhcSEmF6 XNwf+w6SG9WeyI/MEsSt/gGkumR8+tz+qQJnnYNc0nP8pcZEnAlVz3/59AKmVufj Osd4UG/3+BxC6ChSSECitpCoRJror1hu22jJTvFXwebgp5ju2irvamQvxAg5XM3T GBUujKHW5QixZbOGXiOsXw0vkSZSpIbdM1kXZXNPBUe+zZWs3q8= =4jYQ -----END PGP SIGNATURE----- --Apple-Mail=_D2E0B433-D30B-44E1-A3FC-2B179EC2CDA3--