From nobody Sun Jun 30 15:55:57 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 4WBv0Z08Bxz5PyMy; Sun, 30 Jun 2024 15:55: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WBv0Y6TcTz4M7m; Sun, 30 Jun 2024 15:55:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719762957; 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=sUpqrJSE0fxOiQxlq4mPqlvlg+UhPRfQX+43E3wF800=; b=c9rSTrfrCRhYTky6EHKfpE+2Oq3TKJ1F2+zjeqA5CVUevf+v9zGPD/L1FjQHEHluroa2Qi sTtq45sd/zpyfd0DvKc3fQfLYm1Aux5V4MpAqZOnWSyzhJt9HELLXNUx5duR3nSSk9EHe5 lMVlJKvhqb+XMnag7/wVoJsCkktBiyEFehdPFqovkoMhusHrnUJ0bZfG5YY+A0Py5pNxAK Hhg6FnBRYgQINHjgDwE7eukY4YRMVxnlrWqfDqGiVV0ucpGo/FGsNU4ig4CS5czS5+a5ut bLGDF3Ssf4U1Jt2bis+6buv8lSa+AH0TgH0dmBXfKX8DhnV099np6/+UAXLI3Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719762957; a=rsa-sha256; cv=none; b=Zl+7mAKTC9AFagWKpoEEMhGk/LBXQIrzGzDqdk+etE3Sr2ksSxDR//WBBjRSTTDEI6fG1d OaKMHAt26nIhs4SvCyLCkdlU92GcoOEiH7eGffzGnrZmPL1j48gaOUwxUvKmpciQCUaMjj w/ZhY7bn+v9x3JipXoInBOtE3Gm2C5bDsN489yUJoTY9WLz9NJ9Z1gewED5Kx5bUH7T35l e+NiS8rCcI+PcQFEvPsu2vYyMzuXmE+xWHGm99MYWw2eet0H0b5suZrwoc3YSN1JQfsKYv heXOYhA7le8L9K4p238+y26AgrA25Yo7lpMICgsqWXEar0HyVhqYFtuiQIdmrg== 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=1719762957; 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=sUpqrJSE0fxOiQxlq4mPqlvlg+UhPRfQX+43E3wF800=; b=pA8lkx7LB0tICZzJkHvsGMXkdwnKvSI3Qnglpu/zGeRxYgaQxxr+AnK897iRYVqQMC7ufi yWaBXywwY/JgRWbFwy2HnyfjtsvPwezT7E8MVydPfxlKvuCGZwtZFfXFlk05vuGGdgAzyt J+kh1ywi50u+V0ENS9HRVRNQiofv94OtbZLXUG9GVJwHy9LU3scaZauRDjoG9+WPFpec07 a0MU4ydspb9zC+DdIiY2bvSxsTd1Mw65VbiQyFJD0mnELHY67AbWmkjQtC8fKFgoVnLerr XYYSq58mpvB3UO/izfsioskCY4Z4JCJXh9EpZdd8+Y31f5W2oX25IqlM1YioaQ== 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 4WBv0Y5gfwzSfx; Sun, 30 Jun 2024 15:55: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 45UFtvI1014954; Sun, 30 Jun 2024 15:55:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 45UFtv3E014951; Sun, 30 Jun 2024 15:55:57 GMT (envelope-from git) Date: Sun, 30 Jun 2024 15:55:57 GMT Message-Id: <202406301555.45UFtv3E014951@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: 4ce4a0fe14c4 - main - diff: Document the --no-dereference option. 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: 4ce4a0fe14c455c6ec77452bc99cd93ea45737b1 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=4ce4a0fe14c455c6ec77452bc99cd93ea45737b1 commit 4ce4a0fe14c455c6ec77452bc99cd93ea45737b1 Author: Dag-Erling Smørgrav AuthorDate: 2024-06-30 15:55:27 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-06-30 15:55:27 +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 --- 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 9bc46d07b58a..5f211372e15f 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 March 7, 2024 +.Dd June 29, 2024 .Dt DIFF 1 .Os .Sh NAME @@ -52,6 +52,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 @@ -110,6 +112,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 @@ -139,6 +142,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 @@ -171,6 +175,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 @@ -201,6 +206,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 @@ -497,6 +503,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 when comparing file names (default) .It Fl -normal diff --git a/usr.bin/diff/diff.c b/usr.bin/diff/diff.c index c3fe255a294d..5ca9a36505ce 100644 --- a/usr.bin/diff/diff.c +++ b/usr.bin/diff/diff.c @@ -368,7 +368,6 @@ main(int argc, char **argv) optarg); break; case OPT_NO_DEREFERENCE: - rflag = true; noderef = true; break; case OPT_VERSION: