From: Brandon Williams <bmwill@google.com>
To: Stefan Hajnoczi <stefanha@redhat.com>
Cc: git@vger.kernel.org, gitster@pobox.com
Subject: Re: [RFC 2/2] grep: use '/' delimiter for paths
Date: Thu, 19 Jan 2017 10:29:34 -0800 [thread overview]
Message-ID: <20170119182934.GH10641@google.com> (raw)
In-Reply-To: <20170119150347.3484-3-stefanha@redhat.com>
On 01/19, Stefan Hajnoczi wrote:
> 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'
>
> This patch attempts to use the correct delimiter:
>
> $ 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
> (success)
>
> This patch does not cope with @{1979-02-26 18:30:00} syntax and treats
> it as a path because it contains colons.
>
> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
> ---
> builtin/grep.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/builtin/grep.c b/builtin/grep.c
> index 3643d8a..06f8b47 100644
> --- a/builtin/grep.c
> +++ b/builtin/grep.c
> @@ -493,7 +493,8 @@ static int grep_object(struct grep_opt *opt, const struct pathspec *pathspec,
>
> /* Add a delimiter if there isn't one already */
> if (name[len - 1] != '/' && name[len - 1] != ':') {
> - strbuf_addch(&base, ':');
> + /* rev: or rev:path/ */
> + strbuf_addch(&base, strchr(name, ':') ? '/' : ':');
As Jeff mentioned it may be better to base which character gets appended
by checking the obj->type field like this maybe:
diff --git a/builtin/grep.c b/builtin/grep.c
index 69dab5dc5..9dfe11dc7 100644
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -495,7 +495,8 @@ static int grep_object(struct grep_opt *opt, const struct pathspec *pathspec,
/* Add a delimiter if there isn't one already */
if (name[len - 1] != '/' && name[len - 1] != ':') {
/* rev: or rev:path/ */
- strbuf_addch(&base, strchr(name, ':') ? '/' : ':');
+ char del = obj->type == OBJ_COMMIT ? ':' : '/';
+ strbuf_addch(&base, del);
}
}
init_tree_desc(&tree, data, size);
--
Brandon Williams
next prev parent reply other threads:[~2017-01-19 19:03 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 [this message]
2017-01-20 14:17 ` Stefan Hajnoczi
2017-01-19 18:54 ` Junio C Hamano
2017-01-20 14:12 ` Stefan Hajnoczi
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=20170119182934.GH10641@google.com \
--to=bmwill@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=stefanha@redhat.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).