From: Adam Johnson <me@adamj.eu>
To: Junio C Hamano <gitster@pobox.com>
Cc: Adam Johnson via GitGitGadget <gitgitgadget@gmail.com>,
git@vger.kernel.org, Elijah Newren <newren@gmail.com>
Subject: Re: [PATCH] ls-files: document that pathspecs are supported
Date: Sun, 12 Mar 2023 11:52:54 +0000 [thread overview]
Message-ID: <CAMyDDM3VyCdwOLhay0PC8G6azoWCFpxoB1K76mvo5nd2C+sfCg@mail.gmail.com> (raw)
In-Reply-To: <xmqqzg8jxc2r.fsf@gitster.g>
Thank you Junio, that's very good review feedback. Thank you for
finding the correct past commit. I am submitting an updated patch now.
On Sat, Mar 11, 2023 at 8:33 PM Junio C Hamano <gitster@pobox.com> wrote:
>
> "Adam Johnson via GitGitGadget" <gitgitgadget@gmail.com> writes:
>
> > From: Adam Johnson <me@adamj.eu>
> >
> > The command has taken pathspecs, not just filenames, since f0096c06bcd
> > (Convert read_tree{,_recursive} to support struct pathspec, 2011-03-25).
>
> Isn't that commit about ls-tree? The commit does change how the
> tree overlay (i.e. the --with-tree=<tree-ish> option) interacts with
> the given pathspec arguments but that is only because that commit
> changes how read_tree_recursive() has to be called. The support of
> pathspec matching in ls-files dates back to 56fc5108 ([PATCH]
> git-ls-files: generalized pathspecs, 2005-08-21), arguably even
> before the commit "generalized" the already existing path pattern
> match feature.
>
> > diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt
> > index 1abdd3c21c5..2f62374062c 100644
> > --- a/Documentation/git-ls-files.txt
> > +++ b/Documentation/git-ls-files.txt
> > @@ -21,7 +21,7 @@ SYNOPSIS
> > [--exclude-standard]
> > [--error-unmatch] [--with-tree=<tree-ish>]
> > [--full-name] [--recurse-submodules]
> > - [--abbrev[=<n>]] [--format=<format>] [--] [<file>...]
> > + [--abbrev[=<n>]] [--format=<format>] [--] [<pathspec>...]
>
> Good.
>
> > DESCRIPTION
> > -----------
> > @@ -127,12 +127,12 @@ OPTIONS
> > in each directory, and the user's global exclusion file.
> >
> > --error-unmatch::
> > - If any <file> does not appear in the index, treat this as an
> > + If any <pathspec> does not appear in the index, treat this as an
> > error (return 1).
>
> This is no longer correct. "If no path that matches <pathspec>
> appears in the index". When we are given <pathspec>, say '*.txt',
> a path whose string is literally '*.txt' may not appear in the index,
> but as long as there is a path that matches the pattern exists,
> this option does not lead to an error.
>
> > -<file>::
> > +<pathspec>::
> > Files to show. If no files are given all files which match the other
>
> The description also needs to be updated. "Limits the files to show
> to only those that match the given pathspec" or something along that
> line.
>
> Thanks.
next prev parent reply other threads:[~2023-03-12 11:53 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-11 9:19 [PATCH] ls-files: document that pathspecs are supported Adam Johnson via GitGitGadget
2023-03-11 20:33 ` Junio C Hamano
2023-03-12 11:52 ` Adam Johnson [this message]
2023-03-12 11:55 ` [PATCH v2] " Adam Johnson via GitGitGadget
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=CAMyDDM3VyCdwOLhay0PC8G6azoWCFpxoB1K76mvo5nd2C+sfCg@mail.gmail.com \
--to=me@adamj.eu \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=newren@gmail.com \
/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).