From nobody Wed Oct 14 19:41:40 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 4j4hR93KNLz4nBfs for ; Wed, 14 Oct 2026 19:41:41 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4j4hR906WDz3Ff0 for ; Wed, 14 Oct 2026 19:41:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792006901; 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=0Q1wPnvuvaICCm24+jeGR4So/6HwZD3LehTFrjgrv2U=; b=ZSi78MUAgloy9Sc5Dck8sQBcd6Wj/J2RsmSDznF24HaLaGnuadXaXUki6xPYd3cwsCxRmV 3FUHh2/a9vxOFr5mahRxjgEKuhp2NUuVI45MT+x+9efrVnJrirWiBG+FqAXSyCIFOu0YMG 5E2FPtuLQ4Ucdag4VV2Br1mB+DDiZYgpxF/3bJ714IK9yEAqTbWdUhT/yoTeS6WSFzOpEM KFd57xbE4Jg8JxM56x3844uq6tGCQ/3WvFtrx73Hyvr1s3+qucI4MHK1Q2S+AsLWi/NU6W 2h4tKW3/tpY4v25dApVF0Fqz6CAV6gM7DV7Zqr8Gi6qkeLS0Yit3iBqbfAoGfQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1792006901; b=qFV5LBMkQEJqGHQz/TLd2KnqtwlWwdFEORgrM+q2ZvvB+7TyTSrcFm55hzj3Dm3poo1E/J EkqqKx2FyGUS34k+87kPUHkdk1cJYJVqpoVXNX+Qay4KnIzIy9zNeOSOYyrPmjbrJJ6yXj XM6K1hPX1fDLXY7PgM6X3RolvgmMyM0Wh+/NYfNFo+Kz6H2QuRI6H0W/gPuN5gUFQTRSQX OtZI6O66xOqywApEXb1Pt1fM70C8KO94t36kfE5i7UVmWeaPzF9+ds8JJ2Yl9AsKbv9xWU vvpaaqdYO2BkN7aflhY3FpRjaido2i4jL1ArAOuwnOPuyuIh2jUydeQDbIeEyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792006901; 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=0Q1wPnvuvaICCm24+jeGR4So/6HwZD3LehTFrjgrv2U=; b=FbvhwA2eQkUhOs/RA6HNw6gSs213rOjQwvyXtgi4490O6ESXgK3SedEnoUSZUldjRsJ9gv ePcNWQaA1LxdjLmDOhrgalOCr6P0/16WRTp0DGNHdJU/NJlMY241+XMayXNYrAUxHQb2Jt lkRAinN9/82psSi6tq2+jNQFiiJHlW0Be6CsO+O4azm5k04T3u7PCyP71bpbOY8eNM+p9t Ps8mbWs3UAPAmszydieExzoG2sJKXyi85sw3gzDeNc54lL9IYAWDsl+tklIbUNjOiCH5zk Qj7DyKrZc/zMIz1MYcxWI7r1HHRtKtMwH/otxggDbRQ5ifhyXeqSp05k43WCrw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4j4hR86HShz1G5M for ; Wed, 14 Oct 2026 19:41:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f746 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 14 Oct 2026 19:41:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Allan Jude Subject: git: c30a321a61ce - main - diff: support -qq to output absolutely nothing List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: Commit messages for the main branch of the src repository 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: allanjude X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c30a321a61ce7e1c03d4c314b2127b37f75564c6 Auto-Submitted: auto-generated Date: Wed, 14 Oct 2026 19:41:40 +0000 Message-Id: <6acfdaf4.1f746.146b88fd@gitrepo.freebsd.org> The branch main has been updated by allanjude: URL: https://cgit.FreeBSD.org/src/commit/?id=c30a321a61ce7e1c03d4c314b2127b37f75564c6 commit c30a321a61ce7e1c03d4c314b2127b37f75564c6 Author: Allan Jude AuthorDate: 2024-09-20 15:30:58 +0000 Commit: Allan Jude CommitDate: 2026-10-14 19:41:34 +0000 diff: support -qq to output absolutely nothing This is similar to `cmp -s`, but can be combined with: -B --ignore-blank-lines -b --ignore-space-change -w --ignore-all-space To only report a difference if it doesn't involve whitespace Reviewed by: des, bapt, markj (previous version), ziaee (man page) MFC after: 1 week Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D46717 --- usr.bin/diff/diff.1 | 5 ++++- usr.bin/diff/diff.c | 13 ++++++++++--- usr.bin/diff/diff.h | 1 + usr.bin/diff/diffreg.c | 7 +++++-- 4 files changed, 20 insertions(+), 6 deletions(-) diff --git a/usr.bin/diff/diff.1 b/usr.bin/diff/diff.1 index 47f9c11eb3db..791945cc28b0 100644 --- a/usr.bin/diff/diff.1 +++ b/usr.bin/diff/diff.1 @@ -30,7 +30,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd January 7, 2025 +.Dd October 12, 2026 .Dt DIFF 1 .Os .Sh NAME @@ -319,6 +319,9 @@ This is the form used by rcsdiff. .It Fl q -brief Just print a line when the files differ. Does not output a list of changes. +Specify twice +.Pq Fl qq +to output nothing at all, for when you only want to examine the exit code. .It Fl U Ar number Fl -unified Ar number Like .Fl u diff --git a/usr.bin/diff/diff.c b/usr.bin/diff/diff.c index b5fa12268bac..cf3e4ec1f11a 100644 --- a/usr.bin/diff/diff.c +++ b/usr.bin/diff/diff.c @@ -276,7 +276,12 @@ main(int argc, char **argv) case 'q': if (FORMAT_MISMATCHED(D_BRIEF)) conflicting_format(); - diff_format = D_BRIEF; + if (diff_format == D_BRIEF) { + diff_format = D_QUIET; + /* If already D_QUIET, avoid getting more verbose. */ + } else if (diff_format != D_QUIET) { + diff_format = D_BRIEF; + } break; case 'S': start = optarg; @@ -474,8 +479,10 @@ main(int argc, char **argv) if (stat(argv[1], &stb2) == -1) err(2, "%s", argv[1]); } - print_status(diffreg(argv[0], argv[1], dflags, 1), argv[0], - argv[1], ""); + + if (diff_format != D_QUIET) + print_status(diffreg(argv[0], argv[1], dflags, 1), + argv[0], argv[1], ""); } if (fflush(stdout) != 0) err(2, "stdout"); diff --git a/usr.bin/diff/diff.h b/usr.bin/diff/diff.h index fe41e8746f4d..7d9e864b2434 100644 --- a/usr.bin/diff/diff.h +++ b/usr.bin/diff/diff.h @@ -50,6 +50,7 @@ #define D_BRIEF 6 /* Say if the files differ */ #define D_GFORMAT 7 /* Diff with defined changed group format */ #define D_SIDEBYSIDE 8 /* Side by side */ +#define D_QUIET 9 /* Don't output anything */ #define D_UNSET -2 diff --git a/usr.bin/diff/diffreg.c b/usr.bin/diff/diffreg.c index 5c1147bf2730..2ded8382de50 100644 --- a/usr.bin/diff/diffreg.c +++ b/usr.bin/diff/diffreg.c @@ -415,7 +415,8 @@ diffreg_stone(char *file1, char *file2, int flags, int capsicum) goto closem; } - if (diff_format == D_BRIEF && ignore_pats == NULL && + if ((diff_format == D_BRIEF || diff_format == D_QUIET) && + ignore_pats == NULL && (flags & (D_FOLDBLANKS|D_IGNOREBLANKS|D_IGNORECASE| D_SKIPBLANKLINES|D_STRIPCR)) == 0) { @@ -1107,7 +1108,8 @@ restart: return; } proceed: - if (*pflags & D_HEADER && diff_format != D_BRIEF) { + if ((*pflags & D_HEADER) != 0 && + diff_format != D_BRIEF && diff_format != D_QUIET) { printf("%s %s %s\n", diffargs, file1, file2); *pflags &= ~D_HEADER; } @@ -1156,6 +1158,7 @@ proceed: anychange = 1; switch (diff_format) { case D_BRIEF: + case D_QUIET: return; case D_NORMAL: case D_EDIT: