From nobody Wed Sep 16 13:33:15 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 4hlKb02bcNz6tCfT; Wed, 16 Sep 2026 13:33:16 +0000 (UTC) (envelope-from jhb@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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hlKb0181yz4vx0; Wed, 16 Sep 2026 13:33:16 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789565596; 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=0oEGtqtP8nvkx1f4NsCzCk310tjM/HbDldyYGREZQXg=; b=OcFj9rPeJQYtsVMSRJBEQIyCKg/dyhnkFhSkpaz/ZVIjWhnyqazi97HRXTC3eIhVl/LCXX msaLZSvbpN4cAAZk1Eb3TUM6wIE2n9B1FiGajSnB4b4y2JD8LjIPphG3e4vxzujkDIM8i9 Ef5M8IvIN097AUB8LUwfuvyIYd6C97T1XlgY4sqLIq774sKSWb8dJgo/1hXzgWcbWTr1qX AUZ7t7h82rmwzzgwY+cD1W7d6PLeFkX6GdSGi95JLvjFIaf3dEp0uuAf+G8ppUyrub4XzH n8wULkFvmaeotT7X36GDmbEVsFUBdmJKumIbhODXtfEmerfDzjC6hBo4SEZe7w== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1789565596; b=x/f//FbKTX7FQe3aoWOHwDnE2hgyXR5ZfM8rfw3W6Svk6DUKzQsrsRb4VScSS1Z/0X+q0O 2w/1ZMgKn9NF2V4ksTZg/6j3+CDrtQVRRb3EM8vdiGTlDkpHlC6XgOX18oEVcUcNBQyLF+ sYvKe9f6KuGGH4G2sbCAyyNNDBuLf+4xqPbZKG/HvS4mvHVWY78vJvfzTQ15TMuHf6Bi06 ODx+/qrNyHNz6AXBY8JxKvKH3p/WF/kwzRh6ccsaNxwNwVEz2zJDUkUxM+QSW4MBYh5tJX SgFdwCIXn4i4+B8umsGPyUbm1wuvkoPmpDYW9bgH1wvg+IX7L5u9z3tRd6JmDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789565596; 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=0oEGtqtP8nvkx1f4NsCzCk310tjM/HbDldyYGREZQXg=; b=jR2vZ9T6ZmehVMih9pp0HZmxRKK8czfunUFDYyqa4G0WgoTTIMwGubuPrWeSceDY1FLf6R 36u5Lny3sdIXf5XezCjcbTT46e7pAjL2bFgrjjfTRVfEp3R67LpXKKXkSnSAwnosnhKVH8 a1ZLgKDVYyu+h9FkcuQrur/Z3LRobNb2UUo8jREh+ZjsQsc6sjKx21pvO83jSOE1fR0ogI fVGJ5zwhhVAxmQcu9pr5LY9I3kRpMK0FkxYlX6K4EvEhZX2/N8Y8qt/J8Uwf7YUxBwC2AL GA5YrI7quUtSSSHPnlFpRgX0pe2F7sPn0e1am7Hy9MC6ktg9pzp1cynwzgFKNQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from [IPV6:2601:5cc:4402:82e0:2127:d3d7:e2c5:303d] (unknown [IPv6:2601:5cc:4402:82e0:2127:d3d7:e2c5:303d]) (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 did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4hlKZz5xggzcbq; Wed, 16 Sep 2026 13:33:15 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <4026b614-9ea8-4d58-9fbf-7ed5414d5a3e@FreeBSD.org> Date: Wed, 16 Sep 2026 09:33:15 -0400 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 User-Agent: Mozilla Thunderbird From: John Baldwin Subject: Re: git: 09711ccb09f4 - main - Remove source_rc_confs, inlined from defaults/rc.conf To: Devin Teske , Jessica Clarke Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" References: <6aa9b038.338f3.46192136@gitrepo.freebsd.org> <9467A34A-BDA8-4AC0-9883-1A5401EFF7F3@freebsd.org> <96890F48-7939-459C-92D6-026174AF5281@freebsd.org> <8192F29B-C42C-4579-AF0D-109F483846D5@freebsd.org> <6651F051-4227-4ABA-A4A7-06DBB855FE93@freebsd.org> <1EDE9033-8B7A-482B-ADA6-1C943951560A@freebsd.org> <4FF3B06A-0199-4430-A2C9-7D361B03490D@freebsd.org> Content-Language: en-US In-Reply-To: <4FF3B06A-0199-4430-A2C9-7D361B03490D@freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 9/15/26 18:21, Devin Teske wrote: > > >> On Sep 15, 2026, at 3:16 PM, Jessica Clarke wrote: >> >> Half-repaired is fine, you can have multiple Fixes: commits. Having >> those "separate commits on a branch if ordered carefully" be the actual >> commits landed in main is generally best practice, both within the >> project and generally within software engineering. So if that’s >> possible, does that not contradict your statement that splitting would >> leave such "landmines", without any qualification to make it anything >> but an absolute statement? >> > > "Landmines" meant half-repaired tips on main, not every possible > multi-commit series. I landed one atomic Fixes commit for > eaeb5f29bc6f. That choice stands. FWIW, I commonly land separate fixes as multiple commits now in git-world (as opposed to svn) as it does make it easier if you need to revert one of them for some reason (as you don't have to revert the entire thing). Smaller patches, in general, also makes reviewing easier (as Jessica notes). There is no requirement to rolling up fixes into a single commit vs splitting them out, especially if they are all pushed as a single batch. -- John Baldwin