undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jn/grep-open'

Browse Source 
* jn/grep-open:
  grep -O: Do not pass color sequences as filenames to pager
This commit is contained in:
Junio C Hamano 2010-07-15 12:07:18 -07:00
commit a7d7853463
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
builtin/grep.c
View File

@ -1001,6 +1001,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
if (show_in_pager == default_pager) if (show_in_pager == default_pager)
show_in_pager = git_pager(1); show_in_pager = git_pager(1);
if (show_in_pager) { if (show_in_pager) {
opt.color = 0;
opt.name_only = 1; opt.name_only = 1;
opt.null_following_name = 1; opt.null_following_name = 1;
opt.output_priv = &path_list; opt.output_priv = &path_list;

15
t/t7811-grep-open.sh
View File

@ -125,6 +125,21 @@ test_expect_success 'modified file' '
test_cmp empty out test_cmp empty out
' '
test_config() {
git config "$1" "$2" &&
test_when_finished "git config --unset $1"
}
test_expect_success 'copes with color settings' '
rm -f actual &&
echo grep.h >expect &&
test_config color.grep always &&
test_config color.grep.filename yellow &&
test_config color.grep.separator green &&
git grep -O'\''printf "%s\n" >actual'\'' GREP_AND &&
test_cmp expect actual
'
test_expect_success 'run from subdir' ' test_expect_success 'run from subdir' '
rm -f actual && rm -f actual &&
echo grep.c >expect && echo grep.c >expect &&