From 9905382597659d724ba1beef2d24fa97090e942d Mon Sep 17 00:00:00 2001 From: Stefan Hajnoczi Date: Fri, 20 Jan 2017 17:11:26 +0000 Subject: grep: use '/' delimiter for paths 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) Signed-off-by: Stefan Hajnoczi Signed-off-by: Junio C Hamano --- builtin/grep.c | 4 +++- t/t7810-grep.sh | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/builtin/grep.c b/builtin/grep.c index a57aebbfb4..0cd272cb5f 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -814,7 +814,9 @@ 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/ */ + char delim = obj->type == OBJ_COMMIT ? ':' : '/'; + strbuf_addch(&base, delim); } } init_tree_desc(&tree, data, size); diff --git a/t/t7810-grep.sh b/t/t7810-grep.sh index e804a3f323..8a58d5e4dc 100755 --- a/t/t7810-grep.sh +++ b/t/t7810-grep.sh @@ -1445,6 +1445,11 @@ test_expect_success 'grep outputs valid : for HEAD:t/' ' test_cmp expected actual ' +test_expect_success 'grep outputs valid : for HEAD:t' ' + git grep vvv HEAD:t >actual && + test_cmp expected actual +' + cat >expected <