From: Stefan Hajnoczi <stefanha@redhat.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [RFC 2/2] grep: use '/' delimiter for paths
Date: Fri, 20 Jan 2017 14:12:12 +0000 [thread overview]
Message-ID: <20170120141212.GC17499@stefanha-x1.localdomain> (raw)
In-Reply-To: <xmqqpoji2851.fsf@gitster.mtv.corp.google.com>
[-- Attachment #1: Type: text/plain, Size: 2219 bytes --]
On Thu, Jan 19, 2017 at 10:54:02AM -0800, Junio C Hamano wrote:
> Stefan Hajnoczi <stefanha@redhat.com> writes:
>
> > If the tree contains a sub-directory then git-grep(1) output contains a
> > colon character instead of a path separator:
> >
> > $ git grep malloc v2.9.3:t
> > v2.9.3:t:test-lib.sh: setup_malloc_check () {
> > $ git show v2.9.3:t:test-lib.sh
> > fatal: Path 't:test-lib.sh' does not exist in 'v2.9.3'
>
> I am slightly less negative on this compared to 1/2, but not by a
> big margin. The user wanted to feed a subtree to the command,
> instead of doing the more natural
>
> $ git grep -e malloc v2.9.3 -- t
I find <rev>:<path> vs <rev> -- <path> confusing:
| <rev>:<path> | <rev> -- <path>
----------+----------------------+---------------------
git grep | OK | OK
----------+----------------------+---------------------
git show | OK | <path> ignored
----------+----------------------+---------------------
git log | no output | OK
----------+----------------------+---------------------
Neither syntax always does what I expect. If git show <rev> -- <path>
honored <path> then I could use that syntax consistently.
Sorry for going on a tangent. Does it seem reasonable to handle <path>
in git-show(1) as a UI convenience?
> So again, "contains a colon character" is not coming from what Git
> does, but the user gave Git "a colon character" when she didn't have
> to.
>
> Having said that, if we wanted to start ignoring what the end-user
> said in the initial input like 1/2 and 2/2 does (i.e. "this specific
> tree object" as an input), I think the approach to solve for 1/2 and
> 2/2 should be the same. I think we should decide to do a slash
> instead of a colon, not because v2.9.3: has colon at the end and
> v2.9.3:t has colon in it, but because both of these are both bare
> tree objects. The patches presented does not seem to base their
> decision on the actual object type but on the textual input, which
> seems wrong.
Yes, reparsing the name is ugly and I hoped to get feedback with this
RFC. Thanks for the quick review!
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 455 bytes --]
next prev parent reply other threads:[~2017-01-20 14:12 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-19 15:03 [RFC 0/2] grep: make output consistent with revision syntax Stefan Hajnoczi
2017-01-19 15:03 ` [RFC 1/2] grep: only add delimiter if there isn't one already Stefan Hajnoczi
2017-01-19 18:39 ` Junio C Hamano
2017-01-20 13:56 ` Stefan Hajnoczi
2017-01-20 18:16 ` Junio C Hamano
2017-01-23 13:15 ` Stefan Hajnoczi
2017-01-24 19:07 ` Jakub Narębski
2017-01-24 20:48 ` Philip Oakley
2017-01-19 15:03 ` [RFC 2/2] grep: use '/' delimiter for paths Stefan Hajnoczi
2017-01-19 18:29 ` Brandon Williams
2017-01-20 14:17 ` Stefan Hajnoczi
2017-01-19 18:54 ` Junio C Hamano
2017-01-20 14:12 ` Stefan Hajnoczi [this message]
2017-01-20 14:19 ` Jeff King
2017-01-20 22:56 ` Junio C Hamano
2017-01-23 13:29 ` Stefan Hajnoczi
2017-01-24 17:18 ` Phil Hord
2017-01-19 16:59 ` [RFC 0/2] grep: make output consistent with revision syntax Jeff King
2017-01-19 18:26 ` Brandon Williams
2017-01-20 14:18 ` Stefan Hajnoczi
2017-01-20 14:32 ` Jeff King
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170120141212.GC17499@stefanha-x1.localdomain \
--to=stefanha@redhat.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.
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 NNTP newsgroup(s).