From: "Randall S. Becker" <email@example.com>
To: "'Junio C Hamano'" <firstname.lastname@example.org>, "'Jeff King'" <email@example.com>
Subject: RE: [PATCH 0/3] --end-of-options marker
Date: Tue, 6 Aug 2019 12:36:26 -0400 [thread overview]
Message-ID: <firstname.lastname@example.org> (raw)
On August 6, 2019 12:25 PM, Junio wrote:
> Jeff King <email@example.com> writes:
> > It's hard for scripted uses of rev-list, etc, to avoid option
> > injection from untrusted arguments, because revision arguments must
> > come before any "--" separator. I.e.:
> > git rev-list "$revision" -- "$path"
> > might mistake "$revision" for an option (with rev-list, that would
> > make it an error, but something like git-log would default to HEAD).
> Just to make sure I understand what I just read, let me paraphrase.
> We would want to accept
> git rev-list --max-parents=4 \
> --end-of-options \
> --count -- docs/
> so that '--count' would go thru the usual "as we have -- later, it must be
> and we do not even disambiguate. What does get_sha1() say it is?" and
> "docs/" would be taken as a pathspec.
> "git rev-list --max-parents=4 --count -- docs/" would have treated
> as an option and would error out due to lack of any starting revision.
> On the other hand, "git log --count -- docs/" would take "--count"
> as an option, but does not complain about lack of any revs. It just
> digging from HEAD and ends up ignoring the "--count" branch (or is this
> feature meant to support tags? As far as I recall, we do not allow branch
> names that begin with a dash).
> > This series provides an alternative to "--" to stop option parsing
> > without indicating that further arguments are pathspecs.
Would this offer the opportunity to, in the long term, supply options to
external diff engines, for example?
Something like git diff --end-of-options --diff-opt1 --diff-opt2 -- a b
I'm just noodling here, wondering why otherwise
git rev-list --max-parents=4 -- --count docs/
does not work. I thought -- was pretty specific in terms of turning off
interpretation. So is it not a defect that --count is being interpreted?
I have a fear for all my sub-teams who script with the assumption that --
has a specific meaning of stopping interpretation.
> > [1/3]: revision: allow --end-of-options to end option parsing
> > [2/3]: parse-options: allow --end-of-options as a synonym for "--"
> > [3/3]: gitcli: document --end-of-options
> > Documentation/gitcli.txt | 6 ++++++
> > parse-options.c | 3 ++-
> > revision.c | 8 +++++++-
> > t/t0040-parse-options.sh | 7 +++++++
> > t/t4202-log.sh | 7 +++++++
> > t/t6000-rev-list-misc.sh | 8 ++++++++
> > 6 files changed, 37 insertions(+), 2 deletions(-)
next prev parent reply other threads:[~2019-08-06 16:36 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-06 14:38 [PATCH 0/3] --end-of-options marker Jeff King
2019-08-06 14:39 ` [PATCH 1/3] revision: allow --end-of-options to end option parsing Jeff King
2019-08-06 14:40 ` [PATCH 2/3] parse-options: allow --end-of-options as a synonym for "--" Jeff King
2019-08-06 14:40 ` [PATCH 3/3] gitcli: document --end-of-options Jeff King
2019-08-06 16:24 ` [PATCH 0/3] --end-of-options marker Junio C Hamano
2019-08-06 16:36 ` Randall S. Becker [this message]
2019-08-06 17:38 ` Jeff King
2019-08-06 17:58 ` Randall S. Becker
2019-08-06 18:14 ` SZEDER Gábor
2019-08-08 10:03 ` Jeff King
2019-08-06 17:33 ` Jeff King
2019-08-06 22:58 ` brian m. carlson
2019-08-06 23:43 ` Jeff King
2019-08-07 4:17 ` brian m. carlson
2019-08-07 16:54 ` Taylor Blau
2019-08-08 10:28 ` Jeff King
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:
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 \
* 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
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).