From: Paul Eggert <eggert@cs.ucla.edu>
To: Junio C Hamano <gitster@pobox.com>
Cc: "Carlos L. via GitGitGadget" <gitgitgadget@gmail.com>,
git@vger.kernel.org, GNU grep developers <grep-devel@gnu.org>,
"Carlos L." <00xc@protonmail.com>
Subject: Re: [PATCH] grep: add --max-count command line option
Date: Mon, 16 May 2022 22:53:59 -0700 [thread overview]
Message-ID: <27c09033-a7f4-e9f4-5871-42ac38111b75@cs.ucla.edu> (raw)
In-Reply-To: <xmqq1qwt5w2e.fsf@gitster.g>
[-- Attachment #1: Type: text/plain, Size: 736 bytes --]
On 5/16/22 08:36, Junio C Hamano wrote:
> "GNU grep has been doing so for the past 20 years and existing users
> of the command expects '-m 0' to behave that way" is a good enough
> reason, especially if '-m 0' is not the only possible way to say
> "unlimited".
Yes, I'm inclined in the same direction, now that I see more of the
context. That is, GNU grep can continue what it's long been doing, with
the only change being to the documentation so that we document -m-1 as
meaning "unlimited". This minimizes possible disruption to existing
scripts and satisfies the use case of having a way to turn off any
previously-appearing -m option.
I installed the attached to the GNU grep master doc to do that. Hope
this works for you.
[-- Attachment #2: 0001-grep-document-m-better.patch --]
[-- Type: text/x-patch, Size: 1544 bytes --]
From 2deca89cf0c7a99450f88cf0abfadd336511633f Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 16 May 2022 12:18:26 -0700
Subject: [PATCH] grep: document -m better
* doc/grep.in.1, doc/grep.texi: Document behavior of -m 0 and -m -1.
This documents longstanding behavior, and is consistent with
how git grep -m will likely behave.
---
doc/grep.in.1 | 10 ++++++++++
doc/grep.texi | 4 ++++
2 files changed, 14 insertions(+)
diff --git a/doc/grep.in.1 b/doc/grep.in.1
index aba085a..5ba90ee 100644
--- a/doc/grep.in.1
+++ b/doc/grep.in.1
@@ -321,6 +321,16 @@ Scanning each input file stops upon first match.
Stop reading a file after
.I NUM
matching lines.
+If
+.I NUM
+is zero,
+.B grep
+stops right away without reading input.
+A
+.I NUM
+of \-1 is treated as infinity and
+.B grep
+does not stop; this is the default.
If the input is standard input from a regular file,
and
.I NUM
diff --git a/doc/grep.texi b/doc/grep.texi
index b9688c8..b073fa7 100644
--- a/doc/grep.texi
+++ b/doc/grep.texi
@@ -341,6 +341,10 @@ Scanning each input file stops upon first match.
@opindex --max-count
@cindex max-count
Stop after the first @var{num} selected lines.
+If @var{num} is zero, @command{grep} stops right away without reading input.
+A @var{num} of @minus{}1 is treated as infinity and @command{grep}
+does not stop; this is the default.
+
If the input is standard input from a regular file,
and @var{num} selected lines are output,
@command{grep} ensures that the standard input is positioned
--
2.34.1
next prev parent reply other threads:[~2022-05-17 5:54 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-12 13:20 [PATCH] grep: add --max-count command line option Carlos L. via GitGitGadget
2022-05-14 18:16 ` Martin Ågren
2022-05-16 5:57 ` Junio C Hamano
2022-05-16 7:28 ` Paul Eggert
2022-05-16 8:38 ` Carlos L.
2022-05-16 15:36 ` Junio C Hamano
2022-05-17 5:53 ` Paul Eggert [this message]
2022-05-16 15:18 ` Junio C Hamano
-- strict thread matches above, loose matches on Subject: below --
2022-06-20 15:49 Carlos L. via GitGitGadget
2022-06-20 15:57 ` Paul Eggert
2022-06-20 16:25 ` Carlos L.
2022-06-20 16:32 ` Paul Eggert
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=27c09033-a7f4-e9f4-5871-42ac38111b75@cs.ucla.edu \
--to=eggert@cs.ucla.edu \
--cc=00xc@protonmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=grep-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).