Re: [PATCH 1/2] grep: Add the option '--open-files-in-pager'
From: Jonathan Nieder <hidden>
Date: 2016-06-15 22:48:55
Subsystem:
the rest · Maintainer:
Linus Torvalds
Jonathan Nieder wrote:
+test_expect_success 'git grep -O jumps to line in less' ' + cat >expect <<-\EOF && + +/*GREP_PATTERN + grep.h + EOF + >empty && + + GIT_PAGER=./less git grep -O GREP_PATTERN >out + test_cmp expect actual &&
Ugh. We need a static analyzer for shell scripts. :) Short of that, here’s a fixup to squash in. Sorry for the trouble.
diff --git a/t/t7811-grep-open.sh b/t/t7811-grep-open.sh
index 72e4023..fcfc56e 100644
--- a/t/t7811-grep-open.sh
+++ b/t/t7811-grep-open.sh@@ -97,7 +97,7 @@ test_expect_success 'git grep -O jumps to line in less' ' EOF >empty && - GIT_PAGER=./less git grep -O GREP_PATTERN >out + GIT_PAGER=./less git grep -O GREP_PATTERN >out && test_cmp expect actual && test_cmp empty out '
@@ -134,7 +134,7 @@ test_expect_success 'run from subdir' ' cd subdir && export GIT_PAGER && GIT_PAGER='\''printf "%s\n" >../args'\'' && - git grep -O "enum grep_pat_token" >../out + git grep -O "enum grep_pat_token" >../out && GIT_PAGER="pwd >../dir; :" && git grep -O "enum grep_pat_token" >../out2 ) &&
--