From nobody Thu Jul 04 15:31:56 2024 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 4WFLH11JWvz5Ngqw; Thu, 04 Jul 2024 15:31:57 +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 4WFLH10mrjz4hgV; Thu, 4 Jul 2024 15:31:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720107117; 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=rMJnTInzMpIOpSqyu6Vuclvx8JxrstfFN6gfi/d8w04=; b=yplGUb1/urr0njLYrFfkA8QDj4W7OnDdl47lAAthdXtsigmCzrfFxrUoNF979ppcA3c5J6 ktoPXFT5UgZYEc17RSxKORvcnHQ/jsyFp5kcbRdm6pqGTnuBxsb7YIkfSfFcZewv9RrD28 wl5BkH0+Xzdtr8SZA9Hn0ziCmAuQ46uyq6Yfh2dEJZpTJj1L+IDcjH28TWFibvXjWmax2Z s/MY1gw8rRIv3K8Vcs9jqSbhb7R9QmNlcKKF7zzBD0MqsxSYxf4GEF9ioEUKme7ZDRgGWa RkaIr7vIpMMCQDEf6shIg/mzfVhVO0jEOPz5yIGCXkDGwRL5XeTeUrUNN+WwRA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1720107117; a=rsa-sha256; cv=none; b=j04IAHhnjrl1bG3INZIDUNffWOZRCjOYEmAa5WXkBvNO1WdC8TTx9r3TpOVpCCaC9WK/na i7QMTK8yuBIN/PUsoeHOFR3a3udxjrfW5j6I1hRZQKpKQaehIcU6xEtwc1ZQdRaWhlUi38 cq6qoZ0eT1T6+42+/l/kXsl2qeAmiH0z8u6aimMH4MXhSjKcvUxZklxUaiFZbwRz7ofFwV gM3Q0RmOa7o6bhD4qxvn1nCaE2SPTtUPoA5L45e01K67i5f2KlqY6XbZ1/l9cZuhlGGpOp HCCfjb9obUvzKxGel3GKNeNI3jeEvZ0w9GMaDLc+3iNnAP/PPShCOdQA8ey8Gw== 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=1720107117; 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=rMJnTInzMpIOpSqyu6Vuclvx8JxrstfFN6gfi/d8w04=; b=dzYt7qrnVNME9aZeL+LhA/1QR41xTgHcw3rWXBirw5fwZQbqbpJzCVQGiEqIHfOCBvB73F i/jO1JGaKndy3nGGtiFTYlsl/eYAE4V4h3VGhRvipvKpbsJoD83em4cn2t96YguH0MWIdu +UfXbFaOZxYU4RARHg3njlofuJDrC9xTuiQIc+okuZhSxQuuQU2ycjXSpKnieGOSXagOS/ wytd6v+4ajlJotPPrHwXkGGx3nwgGgy+DKL2czOYmNoeJHcShZkI2VbZiYH+eN6yziKO1W N6lKNVW8scgIb0HULBn68aW9dl1AepfGc1RRULnIINBFaS2JoKrd/FoZ2U4gww== 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 4WFLH10NMqzJrd; Thu, 4 Jul 2024 15:31:57 +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 464FVuS4096082; Thu, 4 Jul 2024 15:31:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 464FVuTZ096079; Thu, 4 Jul 2024 15:31:56 GMT (envelope-from git) Date: Thu, 4 Jul 2024 15:31:56 GMT Message-Id: <202407041531.464FVuTZ096079@gitrepo.freebsd.org> 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=B8rgrav?= Subject: git: 16a753759e48 - stable/14 - diff: Document the --no-dereference option. 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 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/14 X-Git-Reftype: branch X-Git-Commit: 16a753759e482c8091b195514d50bc94ae501ccf Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=16a753759e482c8091b195514d50bc94ae501ccf commit 16a753759e482c8091b195514d50bc94ae501ccf Author: Dag-Erling Smørgrav AuthorDate: 2024-06-30 15:55:27 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-07-04 15:31:09 +0000 diff: Document the --no-dereference option. Also, --no-dereference should not imply --recurse. MFC after: 3 days Sponsored by: Klara, Inc. Reviewed by: allanjude Differential Revision: https://reviews.freebsd.org/D45779 (cherry picked from commit 4ce4a0fe14c455c6ec77452bc99cd93ea45737b1) --- usr.bin/diff/diff.1 | 10 +++++++++- usr.bin/diff/diff.c | 1 - 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/usr.bin/diff/diff.1 b/usr.bin/diff/diff.1 index d3978158d1d1..c10b130a2d72 100644 --- a/usr.bin/diff/diff.1 +++ b/usr.bin/diff/diff.1 @@ -29,7 +29,7 @@ .\" .\" @(#)diff.1 8.1 (Berkeley) 6/30/93 .\" -.Dd February 26, 2024 +.Dd June 29, 2024 .Dt DIFF 1 .Os .Sh NAME @@ -53,6 +53,7 @@ .Op Fl -ignore-space-change .Op Fl -initial-tab .Op Fl -minimal +.Op Fl -no-dereference .Op Fl -no-ignore-file-name-case .Op Fl -normal .Op Fl -rcs @@ -83,6 +84,7 @@ .Op Fl -ignore-space-change .Op Fl -initial-tab .Op Fl -minimal +.Op Fl -no-dereference .Op Fl -no-ignore-file-name-case .Op Fl -normal .Op Fl -paginate @@ -109,6 +111,7 @@ .Op Fl -ignore-space-change .Op Fl -initial-tab .Op Fl -minimal +.Op Fl -no-dereference .Op Fl -no-ignore-file-name-case .Op Fl -normal .Op Fl -paginate @@ -137,6 +140,7 @@ .Op Fl -ignore-space-change .Op Fl -initial-tab .Op Fl -minimal +.Op Fl -no-dereference .Op Fl -no-ignore-file-name-case .Op Fl -normal .Op Fl -paginate @@ -168,6 +172,7 @@ .Op Fl -initial-tab .Op Fl -minimal .Op Fl -new-file +.Op Fl -no-dereference .Op Fl -no-ignore-file-name-case .Op Fl -normal .Op Fl -paginate @@ -198,6 +203,7 @@ .Op Fl -ignore-blank-lines .Op Fl -ignore-case .Op Fl -minimal +.Op Fl -no-dereference .Op Fl -no-ignore-file-name-case .Op Fl -strip-trailing-cr .Op Fl -suppress-common-lines @@ -450,6 +456,8 @@ lines from FILE2 .El .It Fl -ignore-file-name-case ignore case when comparing file names +.It Fl -no-dereference +do not follow symbolic links .It Fl -no-ignore-file-name-case do not ignore case wen comparing file names (default) .It Fl -normal diff --git a/usr.bin/diff/diff.c b/usr.bin/diff/diff.c index d947c1e01705..24e851ae9dbf 100644 --- a/usr.bin/diff/diff.c +++ b/usr.bin/diff/diff.c @@ -336,7 +336,6 @@ main(int argc, char **argv) optarg); break; case OPT_NO_DEREFERENCE: - rflag = true; noderef = true; break; case OPT_VERSION: