mirror of
https://github.com/git/git.git
synced 2024-10-28 12:59:41 +01:00
Merge branch 'jc/grep-f-relative-to-cwd'
"cd sub && git grep -f patterns" tried to read "patterns" file at the top level of the working tree; it has been corrected to read "sub/patterns" instead. * jc/grep-f-relative-to-cwd: grep: -f <path> is relative to $cwd
This commit is contained in:
commit
2d2cd0a1bc
2 changed files with 24 additions and 2 deletions
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
@ -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
|
||||
--
|
||||
|
|
Loading…
Reference in a new issue