From nobody Mon Jul 29 14:02:53 2024 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 4WXg6j2fgVz5S40D; Mon, 29 Jul 2024 14:02:53 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WXg6j1w6Mz4q7R; Mon, 29 Jul 2024 14:02:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722261773; 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=tp8jQRmy9B1Yy9yrEIxA8DAIfyr9jYbLpznu2i1UWSw=; b=UigKpP+yub3Ts6558TZKv1W1syz4LmVkuFNvZIc4J8ZOj7IBpmKhW3rxmyhQYSw/3fQgZQ V2nWEkU+O5w2innQcQqROt8sd3ZArLJ/yCjFdnzCoZxnxxgwY2xL/W1k5G5+bzPd9PT8rs z0Itm2mRXYbX7QTcenIXmE8WuiDnGNCrPZnbLrmJD+AUNp6djKRISYk3La03/sOVtkWxt+ yWhqbeyYueEr44dD2iaQBPsd/JDAfCIS2EeI4LyyKA/qb4jY8tV9QSX4drx8DwNDIKJteg fJpS7x/ToECCS8Lhdbkud7P5Y0pUtdnH720tnPGKqdtkeOALfHz6Eg5H4nPJEA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722261773; a=rsa-sha256; cv=none; b=rDV/dSBibxafH4g2d93ldDfulwROMSjihNC+Y7tMBGPMMd91TvK1n8oyoKdM+QVrUWJkuX z6vrUa/EoLvjoNJummNs6F8rv38P+t27yAT2mbV+yF2pnSoRD9ab74XL7JZ0lMNI8YNzCQ jJZNBzSvCZyPFCZFAhR6hxLzg3smgtjXkv1EcHb2encE+pkr35+UzuMpzV6JXcSMrE7cam rcLFWab5/NDD8LJr3PqQygW86dFgQTJF8Okkqya04Q4DTgpYW6PTzrIfRIsI0126sITEtv yIDDgIddo6RyAoWvOqJOtZU0WORs+7dslxnamxVNHlZAQo9wbs51nPziiFDzoQ== 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=1722261773; 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=tp8jQRmy9B1Yy9yrEIxA8DAIfyr9jYbLpznu2i1UWSw=; b=V08f0i4+PhdDchdBMzxbhD9xCOgMFPRT+M7SxwbMv3HJ6whe4/Xd67CxOBQDimyKeAvSZR 6nTLPnfintwZjp4X5d3DdnGEybdDBKLaG+oOADqDdZZQ4e9JrD+c2vBJzYn1xEErDE9RIc QdMK+0lVnZB7DjLP9Etujk2o3rYvvf+v1v6W8ylxyFnHKsNnCDq7MFHtfzuhJWeyimm0cZ 1gzLRBYwn4JekMtOgvZ+SBvV7+pMwcvnrE5hhjtnOlTGendGnAJCctBKFLSY9t4prGn6dR g6Yvd1K5flLMZ6wtlI+pKMxSdniyUevbcUfF7p7lhG6G6QVF6w3G/gUFjaytog== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WXg6j1WLDzcmb; Mon, 29 Jul 2024 14:02:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46TE2rNN049411; Mon, 29 Jul 2024 14:02:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46TE2rdn049408; Mon, 29 Jul 2024 14:02:53 GMT (envelope-from git) Date: Mon, 29 Jul 2024 14:02:53 GMT Message-Id: <202407291402.46TE2rdn049408@gitrepo.freebsd.org> 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=B8rgrav?= Subject: git: ab830de9f58c - main - diff: Fix usage message and documentation. 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 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: ab830de9f58c1b257e42b4fbdd46b3ca6a837ee6 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=ab830de9f58c1b257e42b4fbdd46b3ca6a837ee6 commit ab830de9f58c1b257e42b4fbdd46b3ca6a837ee6 Author: Dag-Erling Smørgrav AuthorDate: 2024-07-29 14:02:21 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-07-29 14:02:21 +0000 diff: Fix usage message and documentation. The `--ignore-all-space` option was incorrectly documented as `--ignore-all-blanks` in some (but not all) places. MFC after: 3 days PR: 280434 Sponsored by: Klara, Inc. Reviewed by: 0mp, markj Differential Revision: https://reviews.freebsd.org/D46160 --- usr.bin/diff/diff.1 | 6 +++--- usr.bin/diff/diff.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/usr.bin/diff/diff.1 b/usr.bin/diff/diff.1 index 5f211372e15f..559434d8e4fb 100644 --- a/usr.bin/diff/diff.1 +++ b/usr.bin/diff/diff.1 @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd June 29, 2024 +.Dd July 26, 2024 .Dt DIFF 1 .Os .Sh NAME @@ -202,7 +202,7 @@ .Op Fl aBbditwW .Op Fl -color Ns = Ns Ar when .Op Fl -expand-tabs -.Op Fl -ignore-all-blanks +.Op Fl -ignore-all-space .Op Fl -ignore-blank-lines .Op Fl -ignore-case .Op Fl -minimal @@ -469,7 +469,7 @@ output adds character(s) to the front of each line which may screw up the indentation of the original source lines and make the output listing difficult to interpret. This option will preserve the original source's indentation. -.It Fl w -ignore-all-blanks +.It Fl w -ignore-all-space Is similar to .Fl b -ignore-space-change but causes whitespace (blanks and tabs) to be totally ignored. diff --git a/usr.bin/diff/diff.c b/usr.bin/diff/diff.c index 5ca9a36505ce..83aa20c52cf3 100644 --- a/usr.bin/diff/diff.c +++ b/usr.bin/diff/diff.c @@ -629,7 +629,7 @@ usage(void) " diff [-aBbdilNPprsTtw] [-c | -e | -f | -n | -q | -u] [--ignore-case]\n" " [--no-ignore-case] [--normal] [--tabsize] [-I pattern] [-L label]\n" " [-F pattern] [-S name] [-X file] [-x pattern] dir1 dir2\n" - " diff [-aBbditwW] [--expand-tabs] [--ignore-all-blanks]\n" + " diff [-aBbditwW] [--expand-tabs] [--ignore-all-space]\n" " [--ignore-blank-lines] [--ignore-case] [--minimal]\n" " [--no-ignore-file-name-case] [--strip-trailing-cr]\n" " [--suppress-common-lines] [--tabsize] [--text] [--width]\n"