diff options
| -rw-r--r-- | builtin/grep.c | 4 | ||||
| -rwxr-xr-x | t/t7810-grep.sh | 5 |
2 files changed, 8 insertions, 1 deletions
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 <rev>:<path> for HEAD:t/' ' test_cmp expected actual ' +test_expect_success 'grep outputs valid <rev>:<path> for HEAD:t' ' + git grep vvv HEAD:t >actual && + test_cmp expected actual +' + cat >expected <<EOF HEAD:t/a/v:vvv HEAD:t/v:vvv |