Re: Bug: Git grep -f reads the filename relative to the repository root
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Oct 12, 2023, 17:28 UTC
- Message-ID
- <xmqqedhzg37z.fsf@gitster.g>
- In-Reply-To
- <CA+JQ7M_htKUv5=GRQEUqWmJrQmFQNfZkPjr8n12CU6x0Khr4dw@mail.gmail.com>
Erik Cervin Edin <erik@cervined.in> writes:
Show 11 quoted lines
> In the Git repository, I ran > > echo tig > pattern-file && > echo git > xdiff/pattern-file && > cd xdfiff && > git grep -f pattern-file > > What did you expect to happen? (Expected behavior) > > Git grep -f to read the pattern-file, in the xdiff directory and > search for lines matching `git` in the xdiff directory.
That does sound like a bug. It should use the original directory as the base of the relative path computation, similar to the way how OPT_FILENAME() options are handled.
Perhaps something along this line, but this is not even compile tested yet.
----- >8 --------- >8 --------- >8 --------- >8 ----- Subject: [PATCH] grep: -f <path> is relative to $cwd
Just like OPT_FILENAME() does, "git grep -f <path>" should treat the <path> relative to the original $cwd by paying attention to the prefix the command is given.
Signed-off-by: Junio C Hamano <gitster@pobox.com> --- builtin/grep.c | 13 +++++++++++-- t/t7810-grep.sh | 13 +++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/builtin/grep.c b/builtin/grep.c index b71222330a..fe78d4c98b 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -4,6 +4,7 @@ * Copyright (c) 2006 Junio C Hamano */ #include "builtin.h" +#include "abspath.h" #include "gettext.h" #include "hex.h" #include "repository.h" @@ -812,14 +813,20 @@ static int file_callback(const struct option *opt, const char *arg, int unset) { struct grep_opt *grep_opt = opt->value; int from_stdin; + const char *filename = arg; FILE *patterns; int lno = 0; struct strbuf sb = STRBUF_INIT; BUG_ON_OPT_NEG(unset); - from_stdin = !strcmp(arg, "-"); - patterns = from_stdin ? stdin : fopen(arg, "r"); + if (!*filename) + ; /* leave it as-is */ + else + filename = prefix_filename_except_for_dash(grep_prefix, filename); + + from_stdin = !strcmp(filename, "-"); + patterns = from_stdin ? stdin : fopen(filename, "r"); if (!patterns) die_errno(_("cannot open '%s'"), arg); while (strbuf_getline(&sb, patterns) == 0) { @@ -833,6 +840,8 @@ static int file_callback(const struct option *opt, const char *arg, int unset) if (!from_stdin) fclose(patterns); strbuf_release(&sb); + if (filename != arg) + free((void *)filename); return 0; } diff --git a/t/t7810-grep.sh b/t/t7810-grep.sh index 39d6d713ec..91ac66935f 100755 --- a/t/t7810-grep.sh +++ b/t/t7810-grep.sh @@ -808,6 +808,19 @@ test_expect_success 'grep -f, ignore empty lines, read patterns from stdin' ' test_cmp expected actual ' +test_expect_success 'grep -f, use cwd relative file' ' + test_when_finished "git rm -f sub/dir/file" && + mkdir -p sub/dir && + echo hit >sub/dir/file && + git add sub/dir/file && + echo hit >sub/dir/pattern && + echo miss >pattern && + ( + cd sub/dir && git grep -f pattern file + ) && + git -C sub/dir grep -f pattern file +' + cat >expected <<EOF y:y yy --
-- 2.42.0-345-gaab89be2eb