From nobody Wed Jan 22 07:35:42 2025 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 4YdG8G6fdxz5l4Nk; Wed, 22 Jan 2025 07:35:42 +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 4YdG8G5mDSz46P4; Wed, 22 Jan 2025 07:35:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737531342; 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=SPPhfP0Mry8g8mUJdUFPl61q8esfSyV2pX2/bFrxKOo=; b=ye10E9zSZse6jUpFvHQiEaUlEPMz2w7iLk57ZuQqrSXqDc93eFFSmdezmXBR3ac7G9a7RG v4+8+oS5shNDOB8i3Lyl+7RG/72U+M2fMuQFR4ikydSCY5lMJ01S+oT9qWsXpBiNHQ7yeL YldxHSsd2DZfzqYWWM71b6YWh1AkpjKwehKKd02c89KtmQr6ZvV+Q6axzLZ4KyXJzu+OoK N3yEM9mEb94fBZV2EwRHRMRJwFcWyD89jTp+ELkCQxYJlCZgQDK/mrgTARJPTuPwp4NqO5 h18S60MRnWMWPX2TV3//IKqEh45RaR3F9SQH6nC0NlRbOAw946NQ5pVgFHIDww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737531342; 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=SPPhfP0Mry8g8mUJdUFPl61q8esfSyV2pX2/bFrxKOo=; b=Qp2UGsOpnIU5fGcoiZpDm6xmFNUKZZ7uZUpJi6aAYePAT05clW5zu6llB4YnBZEfYwsfeC 4nd4TIBV63u+eM2PAKiCLcb+zWVV0Vtahk30YCn7jqoUyV/2A+PGEgjTq1phDrT8dqUBP+ dgGoBWMj48LTc3lcFWJYXvqSzAi5g7fXylG1tTHmS2wSEL1Ov4gcKLI9dbBzwwbTmycR22 5A2Np1lRDzM7wMMweuG6QSDegto6gmzHPbGzy4pOOOWmDVBqLcxLxQ7aR8Axpfx6c09bOD PB6eKXNN2+46tRrZcO5kT7tHwu7Le0DtnCDeJjjIoNeMyM3PhzmSd7aFPFUxfw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737531342; a=rsa-sha256; cv=none; b=ZPJCB/V999lSHfjnwXNnIjfpLgyfgcwLOcchsVgf5cSQFTuZmEEQ8/M3b7VUqYgex1Sp1Q d53iLNUqRUX0Cmrvp4pN+i8OQoQuKP062QEnf9IC5KDhxwJr9NbfE+p5MuAn2qTB8+GWnC d7KCqpR6kYcrfFqkuU40aIUsXDcdNjepPQZVpFhlv/j56gjGGzV8ehdJB2KC7qfMGb1oUs OKIKMgA+LInHlVI/UtnoVv00X2wYx/RMAyvWhu9AkcFpyZGzXjzr36ufZgupYWmHtXRlkn yu+VZJFZuvUS+AajrDykcpAwciyET8XNpDuapheYhrGWSZJD2XOWS7uKg+dZzA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YdG8G5Jk3zk6W; Wed, 22 Jan 2025 07:35:42 +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 50M7Zg13014499; Wed, 22 Jan 2025 07:35:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50M7ZgwU014496; Wed, 22 Jan 2025 07:35:42 GMT (envelope-from git) Date: Wed, 22 Jan 2025 07:35:42 GMT Message-Id: <202501220735.50M7ZgwU014496@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Piotr Pawel Stefaniak Subject: git: 6ba2f08cea8c - main - ls: --group-directories requires stat information 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: pstef X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6ba2f08cea8cd5c801b78eb8842f7f96bf2d255c Auto-Submitted: auto-generated The branch main has been updated by pstef: URL: https://cgit.FreeBSD.org/src/commit/?id=6ba2f08cea8cd5c801b78eb8842f7f96bf2d255c commit 6ba2f08cea8cd5c801b78eb8842f7f96bf2d255c Author: Piotr Paweł Stefaniak AuthorDate: 2025-01-21 22:47:30 +0000 Commit: Piotr Paweł Stefaniak CommitDate: 2025-01-22 07:29:29 +0000 ls: --group-directories requires stat information Fixes: 8b92977857f8 --- bin/ls/ls.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/ls/ls.c b/bin/ls/ls.c index ca0fb9877b7e..b3d0a508d714 100644 --- a/bin/ls/ls.c +++ b/bin/ls/ls.c @@ -547,12 +547,12 @@ main(int argc, char *argv[]) #endif /* - * If not -F, -i, -l, -s, -S or -t options, don't require stat - * information, unless in color mode in which case we do - * need this to determine which colors to display. + * If not -F, -i, -l, -s, -S, -t or --group-directories options, + * don't require stat information, unless in color mode in which case + * we do need this to determine which colors to display. */ if (!f_inode && !f_longform && !f_size && !f_timesort && - !f_sizesort && !f_type + !f_sizesort && !f_type && f_groupdir == GRP_NONE #ifdef COLORLS && !f_color #endif