From: Duy Nguyen <pclouds@gmail.com>
To: Derrick Stolee <stolee@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH 1/8] ls-files: add --json to dump the index
Date: Mon, 24 Jun 2019 19:50:16 +0700 [thread overview]
Message-ID: <CACsJy8B7j=G2VdYPU8W4eoGJhmJ=7r5gK0FV2QQ8twjzNQQzuQ@mail.gmail.com> (raw)
In-Reply-To: <e3b8d7bf-486d-d52f-9a33-6a7ff837552e@gmail.com>
On Wed, Jun 19, 2019 at 8:03 PM Derrick Stolee <stolee@gmail.com> wrote:
> > - show_files(the_repository, &dir);
> > -
> > - if (show_resolve_undo)
> > - show_ru_info(the_repository->index);
> > + if (!show_json) {
> > + show_files(the_repository, &dir);
> > +
> > + if (show_resolve_undo)
> > + show_ru_info(the_repository->index);
> > + } else {
> > + struct json_writer jw = JSON_WRITER_INIT;
> > +
> > + discard_index(the_repository->index);
> > + the_repository->index->jw = &jw;
> > + if (repo_read_index(the_repository) < 0)
> > + die("index file corrupt");
> > + puts(jw.json.buf);
> > + the_repository->index->jw = NULL;
> > + jw_release(&jw);
> > + }
> >
> > if (ps_matched) {
> > int bad;
>
> I see this 'ps_matched' condition at the end, which is related to
> the '--error-unmatch' option. I added "--error-unmatch foo" to my
> command and got the appropriate error message:
>
> error: pathspec 'foo' did not match any file(s) known to git
> Did you forget to 'git add'?
>
> This was sent to stderr while the JSON was in stdout, so this should
> be appropriate to allow both options. Just pointing it out to make
> sure this is intended.
--error-unmatch only makes sense when you specify pathspec (like
"foo") but that does not work well with --json at all because we don't
do filtering (how do we even filter in extensions?). I'll just make
sure that "ls-files --json <pathspec>" is rejected. That'll cover
--error-unmatch.
--
Duy
next prev parent reply other threads:[~2019-06-24 12:50 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-19 9:58 [PATCH 0/8] Add 'ls-files --json' to dump the index in json Nguyễn Thái Ngọc Duy
2019-06-19 9:58 ` [PATCH 1/8] ls-files: add --json to dump the index Nguyễn Thái Ngọc Duy
2019-06-19 10:30 ` Ævar Arnfjörð Bjarmason
2019-06-19 13:03 ` Derrick Stolee
2019-06-21 13:04 ` Johannes Schindelin
2019-06-24 12:50 ` Duy Nguyen [this message]
2019-06-19 9:58 ` [PATCH 2/8] split-index.c: dump "link" extension as json Nguyễn Thái Ngọc Duy
2019-06-19 9:58 ` [PATCH 3/8] fsmonitor.c: dump "FSMN" " Nguyễn Thái Ngọc Duy
2019-06-19 9:58 ` [PATCH 4/8] resolve-undo.c: dump "REUC" " Nguyễn Thái Ngọc Duy
2019-06-19 13:16 ` Derrick Stolee
2019-06-19 9:58 ` [PATCH 5/8] read-cache.c: dump "EOIE" " Nguyễn Thái Ngọc Duy
2019-06-19 9:58 ` [PATCH 6/8] read-cache.c: dump "IEOT" " Nguyễn Thái Ngọc Duy
2019-06-19 13:18 ` Derrick Stolee
2019-06-19 13:24 ` Duy Nguyen
2019-06-19 14:26 ` Derrick Stolee
2019-06-19 9:58 ` [PATCH 7/8] cache-tree.c: dump "TREE" " Nguyễn Thái Ngọc Duy
2019-06-19 9:58 ` [PATCH 8/8] dir.c: dump "UNTR" " Nguyễn Thái Ngọc Duy
2019-06-19 11:58 ` [PATCH 0/8] Add 'ls-files --json' to dump the index in json Derrick Stolee
2019-06-19 12:42 ` Duy Nguyen
2019-06-19 12:48 ` Derrick Stolee
2019-06-19 19:17 ` Jeff King
2019-06-21 8:37 ` Duy Nguyen
2019-06-21 20:48 ` Jeff King
2019-06-21 13:16 ` Johannes Schindelin
2019-06-21 13:49 ` Duy Nguyen
2019-06-21 15:10 ` Junio C Hamano
2019-06-21 20:52 ` Jeff King
2019-06-24 9:35 ` Johannes Schindelin
2019-06-24 9:33 ` Johannes Schindelin
2019-06-24 9:35 ` Duy Nguyen
2019-06-21 20:51 ` Jeff King
2019-06-24 9:52 ` Johannes Schindelin
2019-06-20 4:00 ` Junio C Hamano
2019-06-20 19:12 ` Jeff Hostetler
2019-06-21 23:30 ` brian m. carlson
2019-06-22 2:54 ` Duy Nguyen
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='CACsJy8B7j=G2VdYPU8W4eoGJhmJ=7r5gK0FV2QQ8twjzNQQzuQ@mail.gmail.com' \
--to=pclouds@gmail.com \
--cc=git@vger.kernel.org \
--cc=stolee@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).