From: Alexandr Miloslavskiy <alexandr.miloslavskiy@syntevo.com>
To: phillip.wood@dunelm.org.uk,
Alexandr Miloslavskiy via GitGitGadget <gitgitgadget@gmail.com>,
git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH 3/5] reset: support the --pathspec-from-file option
Date: Tue, 5 Nov 2019 20:36:31 +0100 [thread overview]
Message-ID: <8548babb-db15-3fc8-f99f-678032e476c3@syntevo.com> (raw)
In-Reply-To: <b93592df-561f-36d4-09ce-e02d570c60da@gmail.com>
On 05.11.2019 16:03, Phillip Wood wrote:
>> The new option allows to read either a specified file or `stdin`.
>> Reading from file is a good way to avoid competing for stdin, and
>> also gives some extra flexibility.
>
> I think this flexibility is a good idea
Thanks for your support :) Previously the opinions were mixed and I was
a bit afraid that this will invoke a new round of discussions.
>> Decisions taken for simplicity:
>> 1) The new option is declared incompatible with other options that
>> could use `stdin`.
>
> I'm confused reset does not use stdin does it?
I understand that '--patch' interacts with user via stdin. Will
double-check tomorrow.
>> 2) It is not allowed to pass some refspecs in args and others in file.
>
> s/refspecs/pathspecs/ ?
Thanks! Not quite used to git speak and mix up things sometimes.
>> Also add new '--pathspec-file-null' switch that mirrors '-z' used in
>> various places. Some porcelain commands, such as `git commit`, already
>> use '-z', therefore it needed a new unambiguous name.
>
> As the 'lines' in the file are nul terminated perhaps it would be better
> to call this --pathspec-file-nul or --nul-termination. I think the use
> of --null to mean nul termination for config was a mistake (for grep it
> matches what GUN grep does but it's still unfortunate).
OK, will change to '--pathspec-file-nul'
>> +'git reset' [-q] [--pathspec-from-file=<file> [--pathspec-file-null]]
>> [<tree-ish>]
>
> --pathspec-file would be shorter and still conveys the intent of the
> option. Is this line missing a leading space?
'--pathspec-from-file' was kind of suggested instead of '--paths-file'
by Junio here:
https://public-inbox.org/git/xmqqtv9qr82q.fsf@gitster-ct.c.googlers.com/
so Junio added '-from' to previous writing. Hmm. What do you think,
taking Junio's message into account?
As for whitespaces, sorry, will fix.
>> +'git reset' [-q] [--pathspec-from-file=<file> [--pathspec-file-null]]
>> [<tree-ish>]::
>
> Alignment again
Will fix
>> + These forms reset the index entries for all `<pathspec>` to their
>
> The new form does not mention <pathspec> so this could be confusing
Shall I replace '<pathspec>' with 'pathspecs' ?
> As we have a separate synopsis line for --pathspec-from-file which does
> not mention <pathspec> it might be better just to say "read pathspecs
> from `<file>` instead of the command line".
OK
>> + if (pathspec_from_file) {
>> + if (patch_mode)
>> + die(_("--pathspec-from-file is incompatible with --patch"));
>
> This is sensible as -p is interactive so we wouldn't expect command line
> length to be an issue
Yes, I also thought so. I doubt that user is willing to interactively
decide on hundreds of files.
>> + } else if (pathspec_file_null)
>> + die(_("--pathspec-file-null requires --pathspec-from-file"));
>
> Style nit: the coding guidelines state that if any branch of an if
> statement requires braces then all the branches should be braced. This
> is widely ignored though.
Took this code from a guy who ignored it :) But sure, will change.
> These days we tend to set up the expected files within the relevant test
> case using <<-\EOF to allow indentation and disallow substitution
> (unless it's needed of course)
I'll try to change this.
>> +test_expect_success 'quotes' '
>> + restore_checkpoint &&
>> +
>> + git rm fileA.t &&
>> + printf "\"file\\101.t\"" | git reset --pathspec-from-file=- &&
>> +
>> + verify_state expect.a
>
> If I've understood correctly this doesn't test if a path is correctly
> unquoted, only that it is accepted.
In my understanding, 'verify_state expect.a' should test that it's
correctly understood. Am I wrong?
>> +test_expect_success '--pathspec-from-file is not compatible with
>> --soft --hard' '
>
> s/--soft --hard/--soft or --hard/
Good idea.
>> +test_expect_success 'only touches what was listed' '
>
> s/^/--pathspec-from-file / ?
I thought that whole test package is about '--pathspec-from-file' so I'd
rather not repeat that in every test name. Shall I change that?
next prev parent reply other threads:[~2019-11-05 19:36 UTC|newest]
Thread overview: 80+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-04 19:26 [PATCH 0/5] Add --pathspec-from-file option for reset, commit Alexandr Miloslavskiy via GitGitGadget
2019-11-04 19:26 ` [PATCH 1/5] pathspec: add new function to parse file Alexandr Miloslavskiy via GitGitGadget
2019-11-05 15:02 ` Phillip Wood
2019-11-05 19:14 ` Alexandr Miloslavskiy
2019-11-06 15:56 ` Alexandr Miloslavskiy
2019-11-04 19:26 ` [PATCH 2/5] doc: reset: unify <pathspec> description Alexandr Miloslavskiy via GitGitGadget
2019-11-06 4:01 ` Junio C Hamano
2019-11-06 15:56 ` Alexandr Miloslavskiy
2019-11-07 5:46 ` Junio C Hamano
2019-11-07 11:05 ` Alexandr Miloslavskiy
2019-11-08 3:04 ` Junio C Hamano
2019-11-04 19:26 ` [PATCH 3/5] reset: support the --pathspec-from-file option Alexandr Miloslavskiy via GitGitGadget
2019-11-05 15:03 ` Phillip Wood
2019-11-05 19:22 ` Phillip Wood
2019-11-05 19:36 ` Alexandr Miloslavskiy [this message]
2019-11-06 15:56 ` Alexandr Miloslavskiy
2019-11-05 16:14 ` Phillip Wood
2019-11-05 19:37 ` Alexandr Miloslavskiy
2019-11-06 4:40 ` Junio C Hamano
2019-11-06 15:56 ` Alexandr Miloslavskiy
2019-11-04 19:26 ` [PATCH 4/5] doc: commit: unify <pathspec> description Alexandr Miloslavskiy via GitGitGadget
2019-11-06 4:50 ` Junio C Hamano
2019-11-06 15:56 ` Alexandr Miloslavskiy
2019-11-07 5:54 ` Junio C Hamano
2019-11-07 11:39 ` Alexandr Miloslavskiy
2019-11-04 19:26 ` [PATCH 5/5] commit: support the --pathspec-from-file option Alexandr Miloslavskiy via GitGitGadget
2019-11-05 16:27 ` Phillip Wood
2019-11-05 19:42 ` Alexandr Miloslavskiy
2019-11-06 15:56 ` Alexandr Miloslavskiy
2019-12-10 10:42 ` Phillip Wood
2019-12-11 11:43 ` Alexandr Miloslavskiy
2019-12-11 14:27 ` Phillip Wood
2019-12-11 15:06 ` Alexandr Miloslavskiy
2019-12-11 16:14 ` Junio C Hamano
2019-12-11 16:20 ` Alexandr Miloslavskiy
2019-12-12 14:56 ` Alexandr Miloslavskiy
2019-11-06 4:51 ` Junio C Hamano
2019-11-06 15:51 ` [PATCH v2 0/6] Add --pathspec-from-file option for reset, commit Alexandr Miloslavskiy via GitGitGadget
2019-11-06 15:51 ` [PATCH v2 1/6] parse-options.h: add new options `--pathspec-from-file`, `--pathspec-file-nul` Alexandr Miloslavskiy via GitGitGadget
2019-11-06 15:51 ` [PATCH v2 2/6] pathspec: add new function to parse file Alexandr Miloslavskiy via GitGitGadget
2019-11-19 5:59 ` Junio C Hamano
2019-11-19 16:50 ` Alexandr Miloslavskiy
2019-11-06 15:51 ` [PATCH v2 3/6] doc: reset: unify <pathspec> description Alexandr Miloslavskiy via GitGitGadget
2019-11-19 6:05 ` Junio C Hamano
2019-11-19 16:52 ` Alexandr Miloslavskiy
2019-11-06 15:51 ` [PATCH v2 4/6] reset: support the `--pathspec-from-file` option Alexandr Miloslavskiy via GitGitGadget
2019-11-06 15:51 ` [PATCH v2 5/6] doc: commit: unify <pathspec> description Alexandr Miloslavskiy via GitGitGadget
2019-11-19 6:16 ` Junio C Hamano
2019-11-19 16:53 ` Alexandr Miloslavskiy
2019-11-19 17:02 ` Alexandr Miloslavskiy
2019-11-06 15:51 ` [PATCH v2 6/6] commit: support the --pathspec-from-file option Alexandr Miloslavskiy via GitGitGadget
2019-11-19 6:10 ` Junio C Hamano
2019-11-19 16:56 ` Alexandr Miloslavskiy
2019-11-19 16:48 ` [PATCH v3 0/6] Add --pathspec-from-file option for reset, commit Alexandr Miloslavskiy via GitGitGadget
2019-11-19 16:48 ` [PATCH v3 1/6] parse-options.h: add new options `--pathspec-from-file`, `--pathspec-file-nul` Alexandr Miloslavskiy via GitGitGadget
2019-11-19 16:48 ` [PATCH v3 2/6] pathspec: add new function to parse file Alexandr Miloslavskiy via GitGitGadget
2019-11-19 16:48 ` [PATCH v3 3/6] doc: reset: synchronize <pathspec> description Alexandr Miloslavskiy via GitGitGadget
2019-11-19 16:48 ` [PATCH v3 4/6] reset: support the `--pathspec-from-file` option Alexandr Miloslavskiy via GitGitGadget
2019-11-19 16:48 ` [PATCH v3 5/6] doc: commit: synchronize <pathspec> description Alexandr Miloslavskiy via GitGitGadget
2019-11-19 16:48 ` [PATCH v3 6/6] commit: support the --pathspec-from-file option Alexandr Miloslavskiy via GitGitGadget
2019-11-20 4:04 ` [PATCH v3 0/6] Add --pathspec-from-file option for reset, commit Junio C Hamano
2019-11-20 9:22 ` Alexandr Miloslavskiy
2019-12-03 14:02 ` [PATCH v4 00/13] Add --pathspec-from-file option Alexandr Miloslavskiy via GitGitGadget
2019-12-03 14:02 ` [PATCH v4 01/13] parse-options.h: add new options `--pathspec-from-file`, `--pathspec-file-nul` Alexandr Miloslavskiy via GitGitGadget
2019-12-03 14:02 ` [PATCH v4 02/13] pathspec: add new function to parse file Alexandr Miloslavskiy via GitGitGadget
2019-12-03 14:02 ` [PATCH v4 03/13] doc: reset: synchronize <pathspec> description Alexandr Miloslavskiy via GitGitGadget
2019-12-03 14:02 ` [PATCH v4 04/13] reset: support the `--pathspec-from-file` option Alexandr Miloslavskiy via GitGitGadget
2019-12-03 14:02 ` [PATCH v4 05/13] doc: commit: synchronize <pathspec> description Alexandr Miloslavskiy via GitGitGadget
2019-12-03 14:02 ` [PATCH v4 06/13] commit: support the --pathspec-from-file option Alexandr Miloslavskiy via GitGitGadget
2019-12-03 14:02 ` [PATCH v4 07/13] cmd_add: prepare for next patch Alexandr Miloslavskiy via GitGitGadget
2019-12-03 14:02 ` [PATCH v4 08/13] add: support the --pathspec-from-file option Alexandr Miloslavskiy via GitGitGadget
2019-12-03 14:02 ` [PATCH v4 09/13] doc: checkout: remove duplicate synopsis Alexandr Miloslavskiy via GitGitGadget
2019-12-03 14:02 ` [PATCH v4 10/13] doc: checkout: fix broken text reference Alexandr Miloslavskiy via GitGitGadget
2019-12-03 14:02 ` [PATCH v4 11/13] doc: checkout: synchronize <pathspec> description Alexandr Miloslavskiy via GitGitGadget
2019-12-03 14:02 ` [PATCH v4 12/13] doc: restore: " Alexandr Miloslavskiy via GitGitGadget
2019-12-03 14:02 ` [PATCH v4 13/13] checkout, restore: support the --pathspec-from-file option Alexandr Miloslavskiy via GitGitGadget
2019-12-03 16:55 ` [PATCH v4 00/13] Add " Junio C Hamano
2019-12-03 17:06 ` Alexandr Miloslavskiy
2019-12-04 19:25 ` Junio C Hamano
2019-12-05 10:43 ` Alexandr Miloslavskiy
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=8548babb-db15-3fc8-f99f-678032e476c3@syntevo.com \
--to=alexandr.miloslavskiy@syntevo.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=phillip.wood@dunelm.org.uk \
/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).