From nobody Mon Jun 08 23:01:04 2026 X-Original-To: dev-commits-src-branches@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 4gZ6wJ56Vnz6gtqp for ; Mon, 08 Jun 2026 23:01:04 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gZ6wJ1x2dz3Dyd for ; Mon, 08 Jun 2026 23:01:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780959664; 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=onC6TpSS6xZUs/SD/Io6S2Acrmj2NK/i2C3LouT85MM=; b=pPzFmbZdnU1/uJt7yC3NkcA9j3DZDmurXVDdKQaUd+6B8UWST2j/OHB+gofd2QRRu70I56 XgeanLtl44RdaMwFovRiUD6E/JgNoqxgl+gzn8ThRVEdn7Jhl6vjUFk/FuzTHY5Mk0Gnz0 UUrzkUWjYDyq+v9PtZ+zqDLKa4GGoXAAjz28wqMXDhSW5gr2W6Ai91tmK7kuJYCfsyylNu b8ei1VWt5Xd4UhQv7d+ekazrZq+AGvsLbWk0gOD5TSov9Vd+/qdJhjajFX3TTrWNB//dNB er8maHzAEhM80IPEmAl2BBNKcAFSRTIu/qdSfcQe8SFeMO9ggb7MEmPgWirheg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780959664; a=rsa-sha256; cv=none; b=kuTvM2SRW31nQbbfhoTm1WeNYuCPt56CH5/MuJZwS1stQL0iza1wUjCwuc2105xYm5DULc 5tn792t2hq2YEqRi2dDArX82c7Wzt5StlxFHQt49VRciRKIdqlqt/3SnViGNW2wkfdQt09 oy9Jf46eAtBhBq7+3uwiWigmrffBupaKnywJgEbdTE4PnUAd+1EO26c52Dfx1gDpeTZl5v Q/YktCWHrf4VqNT1SsOvb9aUoapZ7GXLEyFuArPibZwIfs0Akz8jeqYR4XGgYRdDjSBmbZ CpgOcKVufrm9As9Evy4bnw55j+r/ZYlBKFUI0OHXBrVCGZJkqPnaxisM6DC/7A== 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=1780959664; 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=onC6TpSS6xZUs/SD/Io6S2Acrmj2NK/i2C3LouT85MM=; b=IXQVnJOzay5Zyvy45qa69Qio4i5XGjqpelnszrSPaciBOXp2GzoILK2cmHc1ciN0eCBRpa +ZeBumlKC/EcAbeRUIYd8w0CfOYTQ5owt42saqwBpnWd+S1vp1cf3AxOJxSI6egbnkuIgX 3gUirsC3Ww2vV2G6RsFkGbePPJ65fwThhuMTOYi8UD0ZyoMHS36n0fKc4GlWOZVfNIGDU+ mQ6qo8bStRJOs8La3izlew1pOIBVm+G8YAkvmtv+IUPHgD1TGx6QszPHhgexKkdaAKCGqT 8Bj++KcNAVfT4nw2b+AuFUtPVOcU0f1VcLfBiJuNR1NkpAalIhw1ICD7zjO1zg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gZ6wJ0zdBz177B for ; Mon, 08 Jun 2026 23:01:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23c70 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 08 Jun 2026 23:01:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 70dfaf4521d4 - stable/15 - etcupdate: Make diff -l actually work List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/15 X-Git-Reftype: branch X-Git-Commit: 70dfaf4521d4e39c07180c4137b777560ffbccb5 Auto-Submitted: auto-generated Date: Mon, 08 Jun 2026 23:01:04 +0000 Message-Id: <6a2749b0.23c70.839e6d5@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=70dfaf4521d4e39c07180c4137b777560ffbccb5 commit 70dfaf4521d4e39c07180c4137b777560ffbccb5 Author: Dag-Erling Smørgrav AuthorDate: 2026-06-04 22:41:27 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-06-08 23:00:42 +0000 etcupdate: Make diff -l actually work While here, remove unnecessary blank lines. MFC after: 1 week Fixes: 6d65c91b9a47 ("etcupdate: fix arguments order of diff command") Reviewed by: Boris Lytochkin Differential Revision: https://reviews.freebsd.org/D57330 (cherry picked from commit a85e39030f8c7faa3d5a33373389440de6f0fff7) --- usr.sbin/etcupdate/etcupdate.sh | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/usr.sbin/etcupdate/etcupdate.sh b/usr.sbin/etcupdate/etcupdate.sh index f62343a24eee..738e4f4ef378 100755 --- a/usr.sbin/etcupdate/etcupdate.sh +++ b/usr.sbin/etcupdate/etcupdate.sh @@ -504,42 +504,32 @@ diffnode() $COMPARE_EQUAL) ;; $COMPARE_ONLYFIRST) - echo echo "Removed: $3" - echo ;; $COMPARE_ONLYSECOND) - echo echo "Added: $3" - echo ;; $COMPARE_DIFFTYPE) first=`file_type $1/$3` second=`file_type $2/$3` - echo echo "Node changed from a $first to a $second: $3" - echo ;; $COMPARE_DIFFLINKS) first=`readlink $1/$file` second=`readlink $2/$file` - echo echo "Link changed: $file" rule "=" echo "-$first" echo "+$second" - echo ;; $COMPARE_DIFFFILES) if [ -n "$difflistonly" ]; then - echo echo "Changed: $3" - echo - break; + else + echo "Index: $3" + rule "=" + diff -u $diffargs -L "$3 ($4)" -L "$3 ($5)" $1/$3 $2/$3 fi - echo "Index: $3" - rule "=" - diff -u $diffargs -L "$3 ($4)" -L "$3 ($5)" $1/$3 $2/$3 ;; esac }