From nobody Thu Jun 4 22:41:58 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 4gWfh669jXz6h4f4 for ; Thu, 04 Jun 2026 22:41:58 +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 4gWfh63rVcz3ZG9 for ; Thu, 04 Jun 2026 22:41:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780612918; 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=v8w7LJiKImfkBWl0HFgV148VWx3gESg7HtEQaoRs3OQ=; b=Ixk0AV8gWUhiCjoxhU4ekR7stkTxBG68E05fzqhTK8Xa2TCRrI0iwN7YwqeMBKVk1ovOcM 7wfcGnyPLFNiVzlqi3S4v8Pgg4G5aL6kqxeOuxCcPFvGqkFp5otr9siualLQ3LCMEXcn1V ZIUJLv5mtJLk0oP2Bb7ZfbWgOldLtyZMx0f7Q1o/qfKT92zBtlN9q2Puquwx9F2k9NhAl6 8z6bvZfug8P0J++hEIX2WEMZJg3KxGK+1GLE7drqxdWlKOIPavN58UNZEN/mZbzo4e5BSu 0XmB7LeHtrknNGLrwlRFsE3XV+XzkBFJE+T4DsZeGXgJCAf9vmVwGiUb/p4Aog== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780612918; a=rsa-sha256; cv=none; b=ccv5UvCOHFcNEeNEu30qPcgBMckY0MUUqW/Uu/6SsBvQdaPVRwTkNnCREP38qjzk04SDGU vukkNoq19VZPsQERCrGwK7iB11+JOx3klA3zEp7+sfHI0ciSHLYvHK3nWiqgyHY7dgNstK WJyE+csf0W80u2/lGnZUcCvtCuI0TAdGXgTKSjQl5kkADg+EuCtJK8Y50mpluu1Tixhdhr oaT0fOqYngG8T1Hv+7o85xwW6mZRp5AOzKR0c4wtV3UtKE4qjwy4KGPhyjhlX9TrxRQpCt 5zr+Sy23tgTw/PEsa0fb3rcXuwe2N9ioW4coE4pgmMWXeVJpql6PHV2yaI6aaw== 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=1780612918; 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=v8w7LJiKImfkBWl0HFgV148VWx3gESg7HtEQaoRs3OQ=; b=v0vgU6vr0opdRLVmfIO7LCjQLtMreGIjQYGpEzjxo/w18P+6Sc1HWqfFtzwaHGED/9Ab80 Mj2DbXJto7tQS+/FtY2qaRH7/HvuyXKUgooBPzYUdn8OyYmTCNCK5QLZ8Y4GG3sULwqguc jJjZsrmnrLx6UB1FJbae95DqFJMJ1Wpepu2wY9ijfWpw3icnxMQGvAeNKAN2DRgYs+1Csl RKiLQT7da2i1NMcIDWSgEQsslnIdqFzlYazH1+ZNb7A4pi5NJvh7CX3r5gUXm6SfFgBI8h u/02lzMsnouC2qsW+rTXe8DhO6Vn2rJ4CEesRDZzKbZBWp4lg/obrtN05k5XGw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gWfh62yK9z1HFQ for ; Thu, 04 Jun 2026 22:41:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4515d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 04 Jun 2026 22:41:58 +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: a85e39030f8c - main - etcupdate: Make diff -l actually work 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: a85e39030f8c7faa3d5a33373389440de6f0fff7 Auto-Submitted: auto-generated Date: Thu, 04 Jun 2026 22:41:58 +0000 Message-Id: <6a21ff36.4515d.171ae775@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=a85e39030f8c7faa3d5a33373389440de6f0fff7 commit a85e39030f8c7faa3d5a33373389440de6f0fff7 Author: Dag-Erling Smørgrav AuthorDate: 2026-06-04 22:41:27 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-06-04 22:41:27 +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 --- 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 3ff11ec836ae..77fd400a624b 100755 --- a/usr.sbin/etcupdate/etcupdate.sh +++ b/usr.sbin/etcupdate/etcupdate.sh @@ -500,42 +500,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 }