From nobody Sun Mar 1 19:07:14 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 4fPBQF6Wxqz6TWZn; Sun, 01 Mar 2026 19:07:17 +0000 (UTC) (envelope-from des@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fPBQF5wgPz3rsy; Sun, 01 Mar 2026 19:07:17 +0000 (UTC) (envelope-from des@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772392037; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=I3Sj7eSWHX/Tuszk1jdhB46RdgYowo7kdEoCmtjurVQ=; b=ma7wq62iD5Y7ycvqs9u2ss7OOO5Xk6zWBWksksyZGjKT9d5aeKQiRNZIYM1oTFlh2E5SUv t5GJSGoP71O/XYMrCgeBsSdOw6K+XKPXP9nPotsuq0538LLbPRBarz1SGfcCScTxRFFYzb q1ljLVdEH4BcVNlNYqmVG2C+dEcynyr9uLuoCORCI6Qw9TG577PwcbifMabXflADLVKtN7 sOAlksQMYMGLxAeVarllEc8QqNUwWfyjMFGNjWTZSgVK0I98Gbr0K5I5rwTseRYHtOwjn5 6NUOLBTwgi3fJlkmu4622hVhuSAYC+JyBMej+tGfVtkWf3nNe6UQyWv7OSl3Kw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772392037; a=rsa-sha256; cv=none; b=pc+1Z+4m/aeAjwD0aQoN/EBF9UR9/wetj9H0qV2+S+tDk10MuZTHhfgFx4y7B8WWr6ydIp /M3XEio9aH1ucE0LTp8FjqrDfALqao4VTO8FFTBowhB1O/t89MiS5iS7jeRQlay9HbP4gK s/qUO+AVGulNWOjh0dVrcEUFwxbICGifQ7xpU1H5TybNZsBgki8EEVPky3KL/R7ChpCLB2 0BItyo/NGwsrnDWfxDPfMVAMokxwusc2igPAFGLPeYCvFmUDb2MZFXbhiyGLQMrapALVSF 3D1w5DOZozf6J1HZO5Cygylr/lGbOw18l47Vx/Qcg/JnPIoW5taZAKiAuMbntA== 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=1772392037; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=I3Sj7eSWHX/Tuszk1jdhB46RdgYowo7kdEoCmtjurVQ=; b=mozUIiXuGcBFMIXoF+WZQ8ueBintz8xpHCf7UjcrKYM8xr4C5f8j7s3CjMIt/FV62MrIdk OcAvUAUKDEwarpHKTcQdMtuSSkcX33wwXY1nG3xx2uVJzu2BIL+xkiK1eDy1hRH6/9TdaG mz6Cvop8s2XTWyC6T6FD/eLw5kuwWJKhon/zJpixZ3KR4fFyFmAJtMTV0xf4JzYXIoBmSq 7czVebeVUmlgeCeJZBPns0X06sNdoWX16Tq4V0MVtKZkYfJjC3WD0nTQvs8V+R9d+9EU/9 fq0XpH6fiGFzL+oitpdf4IS2o9LNp/2teoDo6bVTdUoxj1eTetY2ASfnvckg9Q== Received: from ltc.des.dev (2a01cb0585090500922e16fffef1acef.ipv6.abo.wanadoo.fr [IPv6:2a01:cb05:8509:500:922e:16ff:fef1:acef]) (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) (Authenticated sender: des) by smtp.freebsd.org (Postfix) with ESMTPSA id 4fPBQF4W3dzNN8; Sun, 01 Mar 2026 19:07:17 +0000 (UTC) (envelope-from des@freebsd.org) Received: by ltc.des.dev (Postfix, from userid 1001) id 825DAF7536; Sun, 01 Mar 2026 20:07:14 +0100 (CET) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Enji Cooper Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: c2dee7786bf3 - main - diff3: Code cleanup In-Reply-To: <5AF72509-9232-4B17-853D-A12D9862C422@gmail.com> (Enji Cooper's message of "Sun, 1 Mar 2026 10:07:29 -0800") References: <86tsuzojnj.fsf@ltc.des.dev> <5AF72509-9232-4B17-853D-A12D9862C422@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Date: Sun, 01 Mar 2026 20:07:14 +0100 Message-ID: <86pl5nnzbx.fsf@ltc.des.dev> 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: quoted-printable Enji Cooper writes: > I wasn=E2=80=99t aware that their version didn=E2=80=99t really work; the= RCS Id in > the file was ancient, hence the question about reconciling with > OpenBSD (I thought there was a chance that we could maybe leverage > some of their code/fixes in the future to reduce maintenance effort). I think the opposite would be more likely. The only functional changes to OpenBSD's diff3 since the version recorded in our copy was to fix issues with inputs that don't end in a newline. > About the sysexits change: is there a reason why it was made? I=E2=80=99m > asking because another recent change made by an external contributor > introduced sysexits use, whereas this change removed it. EXIT_SUCCESS and EXIT_FAILURE are not sysexits, they are ISO C aliases for 0 and 1. They were only used in three places, while the rest of the code used 0, 1, or 2. I'm not opposed to switching to sysexits, but I don't really see any benefit. DES --=20 Dag-Erling Sm=C3=B8rgrav - des@FreeBSD.org