diff options
| author | Stefan Hajnoczi <stefanha@redhat.com> | 2017-01-20 17:11:26 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-01-20 14:14:09 -0800 |
| commit | 9905382597659d724ba1beef2d24fa97090e942d (patch) | |
| tree | 0b207cfbcff35a7d1ea195e761d34ecf9e370e88 | |
| parent | 257ad080657f995fb3ed03eff98634a190777e53 (diff) | |
| download | git-sh/grep-tree-obj-tweak-output.tar.gz | |
grep: use '/' delimiter for pathssh/grep-tree-obj-tweak-output
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 <stefanha@redhat.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -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 |