From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 30 Jun 2010 18:55:38 +0000 (-0700)
Subject: Merge branch 'jn/grep-open'
X-Git-Tag: v1.7.2-rc1~7
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=6f82be05191a4ec2adcbcac65078f87900ea8741;p=git.git

Merge branch 'jn/grep-open'

* jn/grep-open:
  t/t7811-grep-open.sh: remove broken/redundant creation of fake "less" script
  t/t7811-grep-open.sh: ensure fake "less" is made executable
  t/lib-pager.sh: remove unnecessary '^' from 'expr' regular expression
  grep -O: allow optional argument specifying the pager (or editor)
  grep: Add the option '--open-files-in-pager'
  Unify code paths of threaded greps
  grep: refactor grep_objects loop into its own function

Conflicts:
	t/t7006-pager.sh
---

6f82be05191a4ec2adcbcac65078f87900ea8741
diff --cc t/t7006-pager.sh
index 9a83241c9,fc993fc8c..c2a3c8e2e
--- a/t/t7006-pager.sh
+++ b/t/t7006-pager.sh
@@@ -158,22 -159,13 +159,13 @@@ test_expect_success 'color when writin
  	colorful colorful.log
  '
  
- test_expect_success 'determine default pager' '
- 	unset PAGER GIT_PAGER;
- 	test_might_fail git config --unset core.pager ||
- 	cleanup_fail &&
- 
- 	less=$(git var GIT_PAGER) &&
- 	test -n "$less"
- '
- 
- if expr "$less" : '[a-z][a-z]*$' >/dev/null && test_have_prereq TTY
+ if test_have_prereq SIMPLEPAGER && test_have_prereq TTY
  then
- 	test_set_prereq SIMPLEPAGER
+ 	test_set_prereq SIMPLEPAGERTTY
  fi
  
- test_expect_success SIMPLEPAGER 'default pager is used by default' '
+ test_expect_success SIMPLEPAGERTTY 'default pager is used by default' '
 -	unset PAGER GIT_PAGER &&
 +	unset PAGER GIT_PAGER;
  	test_might_fail git config --unset core.pager &&
  	rm -f default_pager_used ||
  	cleanup_fail &&
diff --cc t/t7810-grep.sh
index 000000000,e249c3ed4..8a6322765
mode 000000,100755..100755
--- a/t/t7810-grep.sh
+++ b/t/t7810-grep.sh
@@@ -1,0 -1,530 +1,530 @@@
+ #!/bin/sh
+ #
+ # Copyright (c) 2006 Junio C Hamano
+ #
+ 
+ test_description='git grep various.
+ '
+ 
+ . ./test-lib.sh
+ 
+ cat >hello.c <<EOF
+ #include <stdio.h>
+ int main(int argc, const char **argv)
+ {
+ 	printf("Hello world.\n");
+ 	return 0;
+ 	/* char ?? */
+ }
+ EOF
+ 
+ test_expect_success setup '
+ 	{
+ 		echo foo mmap bar
+ 		echo foo_mmap bar
+ 		echo foo_mmap bar mmap
+ 		echo foo mmap bar_mmap
+ 		echo foo_mmap bar mmap baz
+ 	} >file &&
+ 	echo vvv >v &&
+ 	echo ww w >w &&
+ 	echo x x xx x >x &&
+ 	echo y yy >y &&
+ 	echo zzz > z &&
+ 	mkdir t &&
+ 	echo test >t/t &&
+ 	echo vvv >t/v &&
+ 	mkdir t/a &&
+ 	echo vvv >t/a/v &&
+ 	git add . &&
+ 	test_tick &&
+ 	git commit -m initial
+ '
+ 
+ test_expect_success 'grep should not segfault with a bad input' '
+ 	test_must_fail git grep "("
+ '
+ 
+ for H in HEAD ''
+ do
+ 	case "$H" in
+ 	HEAD)	HC='HEAD:' L='HEAD' ;;
+ 	'')	HC= L='in working tree' ;;
+ 	esac
+ 
+ 	test_expect_success "grep -w $L" '
+ 		{
+ 			echo ${HC}file:1:foo mmap bar
+ 			echo ${HC}file:3:foo_mmap bar mmap
+ 			echo ${HC}file:4:foo mmap bar_mmap
+ 			echo ${HC}file:5:foo_mmap bar mmap baz
+ 		} >expected &&
+ 		git grep -n -w -e mmap $H >actual &&
 -		diff expected actual
++		test_cmp expected actual
+ 	'
+ 
+ 	test_expect_success "grep -w $L (w)" '
+ 		: >expected &&
+ 		! git grep -n -w -e "^w" >actual &&
+ 		test_cmp expected actual
+ 	'
+ 
+ 	test_expect_success "grep -w $L (x)" '
+ 		{
+ 			echo ${HC}x:1:x x xx x
+ 		} >expected &&
+ 		git grep -n -w -e "x xx* x" $H >actual &&
 -		diff expected actual
++		test_cmp expected actual
+ 	'
+ 
+ 	test_expect_success "grep -w $L (y-1)" '
+ 		{
+ 			echo ${HC}y:1:y yy
+ 		} >expected &&
+ 		git grep -n -w -e "^y" $H >actual &&
 -		diff expected actual
++		test_cmp expected actual
+ 	'
+ 
+ 	test_expect_success "grep -w $L (y-2)" '
+ 		: >expected &&
+ 		if git grep -n -w -e "^y y" $H >actual
+ 		then
+ 			echo should not have matched
+ 			cat actual
+ 			false
+ 		else
 -			diff expected actual
++			test_cmp expected actual
+ 		fi
+ 	'
+ 
+ 	test_expect_success "grep -w $L (z)" '
+ 		: >expected &&
+ 		if git grep -n -w -e "^z" $H >actual
+ 		then
+ 			echo should not have matched
+ 			cat actual
+ 			false
+ 		else
 -			diff expected actual
++			test_cmp expected actual
+ 		fi
+ 	'
+ 
+ 	test_expect_success "grep $L (t-1)" '
+ 		echo "${HC}t/t:1:test" >expected &&
+ 		git grep -n -e test $H >actual &&
 -		diff expected actual
++		test_cmp expected actual
+ 	'
+ 
+ 	test_expect_success "grep $L (t-2)" '
+ 		echo "${HC}t:1:test" >expected &&
+ 		(
+ 			cd t &&
+ 			git grep -n -e test $H
+ 		) >actual &&
 -		diff expected actual
++		test_cmp expected actual
+ 	'
+ 
+ 	test_expect_success "grep $L (t-3)" '
+ 		echo "${HC}t/t:1:test" >expected &&
+ 		(
+ 			cd t &&
+ 			git grep --full-name -n -e test $H
+ 		) >actual &&
 -		diff expected actual
++		test_cmp expected actual
+ 	'
+ 
+ 	test_expect_success "grep -c $L (no /dev/null)" '
+ 		! git grep -c test $H | grep /dev/null
+         '
+ 
+ 	test_expect_success "grep --max-depth -1 $L" '
+ 		{
+ 			echo ${HC}t/a/v:1:vvv
+ 			echo ${HC}t/v:1:vvv
+ 			echo ${HC}v:1:vvv
+ 		} >expected &&
+ 		git grep --max-depth -1 -n -e vvv $H >actual &&
+ 		test_cmp expected actual
+ 	'
+ 
+ 	test_expect_success "grep --max-depth 0 $L" '
+ 		{
+ 			echo ${HC}v:1:vvv
+ 		} >expected &&
+ 		git grep --max-depth 0 -n -e vvv $H >actual &&
+ 		test_cmp expected actual
+ 	'
+ 
+ 	test_expect_success "grep --max-depth 0 -- '*' $L" '
+ 		{
+ 			echo ${HC}t/a/v:1:vvv
+ 			echo ${HC}t/v:1:vvv
+ 			echo ${HC}v:1:vvv
+ 		} >expected &&
+ 		git grep --max-depth 0 -n -e vvv $H -- "*" >actual &&
+ 		test_cmp expected actual
+ 	'
+ 
+ 	test_expect_success "grep --max-depth 1 $L" '
+ 		{
+ 			echo ${HC}t/v:1:vvv
+ 			echo ${HC}v:1:vvv
+ 		} >expected &&
+ 		git grep --max-depth 1 -n -e vvv $H >actual &&
+ 		test_cmp expected actual
+ 	'
+ 
+ 	test_expect_success "grep --max-depth 0 -- t $L" '
+ 		{
+ 			echo ${HC}t/v:1:vvv
+ 		} >expected &&
+ 		git grep --max-depth 0 -n -e vvv $H -- t >actual &&
+ 		test_cmp expected actual
+ 	'
+ 
+ done
+ 
+ cat >expected <<EOF
+ file:foo mmap bar_mmap
+ EOF
+ 
+ test_expect_success 'grep -e A --and -e B' '
+ 	git grep -e "foo mmap" --and -e bar_mmap >actual &&
+ 	test_cmp expected actual
+ '
+ 
+ cat >expected <<EOF
+ file:foo_mmap bar mmap
+ file:foo_mmap bar mmap baz
+ EOF
+ 
+ 
+ test_expect_success 'grep ( -e A --or -e B ) --and -e B' '
+ 	git grep \( -e foo_ --or -e baz \) \
+ 		--and -e " mmap" >actual &&
+ 	test_cmp expected actual
+ '
+ 
+ cat >expected <<EOF
+ file:foo mmap bar
+ EOF
+ 
+ test_expect_success 'grep -e A --and --not -e B' '
+ 	git grep -e "foo mmap" --and --not -e bar_mmap >actual &&
+ 	test_cmp expected actual
+ '
+ 
+ test_expect_success 'grep should ignore GREP_OPTIONS' '
+ 	GREP_OPTIONS=-v git grep " mmap bar\$" >actual &&
+ 	test_cmp expected actual
+ '
+ 
+ test_expect_success 'grep -f, non-existent file' '
+ 	test_must_fail git grep -f patterns
+ '
+ 
+ cat >expected <<EOF
+ file:foo mmap bar
+ file:foo_mmap bar
+ file:foo_mmap bar mmap
+ file:foo mmap bar_mmap
+ file:foo_mmap bar mmap baz
+ EOF
+ 
+ cat >pattern <<EOF
+ mmap
+ EOF
+ 
+ test_expect_success 'grep -f, one pattern' '
+ 	git grep -f pattern >actual &&
+ 	test_cmp expected actual
+ '
+ 
+ cat >expected <<EOF
+ file:foo mmap bar
+ file:foo_mmap bar
+ file:foo_mmap bar mmap
+ file:foo mmap bar_mmap
+ file:foo_mmap bar mmap baz
+ t/a/v:vvv
+ t/v:vvv
+ v:vvv
+ EOF
+ 
+ cat >patterns <<EOF
+ mmap
+ vvv
+ EOF
+ 
+ test_expect_success 'grep -f, multiple patterns' '
+ 	git grep -f patterns >actual &&
+ 	test_cmp expected actual
+ '
+ 
+ cat >expected <<EOF
+ file:foo mmap bar
+ file:foo_mmap bar
+ file:foo_mmap bar mmap
+ file:foo mmap bar_mmap
+ file:foo_mmap bar mmap baz
+ t/a/v:vvv
+ t/v:vvv
+ v:vvv
+ EOF
+ 
+ cat >patterns <<EOF
+ 
+ mmap
+ 
+ vvv
+ 
+ EOF
+ 
+ test_expect_success 'grep -f, ignore empty lines' '
+ 	git grep -f patterns >actual &&
+ 	test_cmp expected actual
+ '
+ 
+ cat >expected <<EOF
+ y:y yy
+ --
+ z:zzz
+ EOF
+ 
+ test_expect_success 'grep -q, silently report matches' '
+ 	>empty &&
+ 	git grep -q mmap >actual &&
+ 	test_cmp empty actual &&
+ 	test_must_fail git grep -q qfwfq >actual &&
+ 	test_cmp empty actual
+ '
+ 
+ # Create 1024 file names that sort between "y" and "z" to make sure
+ # the two files are handled by different calls to an external grep.
+ # This depends on MAXARGS in builtin-grep.c being 1024 or less.
+ c32="0 1 2 3 4 5 6 7 8 9 a b c d e f g h i j k l m n o p q r s t u v"
+ test_expect_success 'grep -C1, hunk mark between files' '
+ 	for a in $c32; do for b in $c32; do : >y-$a$b; done; done &&
+ 	git add y-?? &&
+ 	git grep -C1 "^[yz]" >actual &&
+ 	test_cmp expected actual
+ '
+ 
+ test_expect_success 'grep -C1 hunk mark between files' '
+ 	git grep -C1 "^[yz]" >actual &&
+ 	test_cmp expected actual
+ '
+ 
+ test_expect_success 'log grep setup' '
+ 	echo a >>file &&
+ 	test_tick &&
+ 	GIT_AUTHOR_NAME="With * Asterisk" \
+ 	GIT_AUTHOR_EMAIL="xyzzy@frotz.com" \
+ 	git commit -a -m "second" &&
+ 
+ 	echo a >>file &&
+ 	test_tick &&
+ 	git commit -a -m "third"
+ 
+ '
+ 
+ test_expect_success 'log grep (1)' '
+ 	git log --author=author --pretty=tformat:%s >actual &&
+ 	( echo third ; echo initial ) >expect &&
+ 	test_cmp expect actual
+ '
+ 
+ test_expect_success 'log grep (2)' '
+ 	git log --author=" * " -F --pretty=tformat:%s >actual &&
+ 	( echo second ) >expect &&
+ 	test_cmp expect actual
+ '
+ 
+ test_expect_success 'log grep (3)' '
+ 	git log --author="^A U" --pretty=tformat:%s >actual &&
+ 	( echo third ; echo initial ) >expect &&
+ 	test_cmp expect actual
+ '
+ 
+ test_expect_success 'log grep (4)' '
+ 	git log --author="frotz\.com>$" --pretty=tformat:%s >actual &&
+ 	( echo second ) >expect &&
+ 	test_cmp expect actual
+ '
+ 
+ test_expect_success 'log grep (5)' '
+ 	git log --author=Thor -F --pretty=tformat:%s >actual &&
+ 	( echo third ; echo initial ) >expect &&
+ 	test_cmp expect actual
+ '
+ 
+ test_expect_success 'log grep (6)' '
+ 	git log --author=-0700  --pretty=tformat:%s >actual &&
+ 	>expect &&
+ 	test_cmp expect actual
+ '
+ 
+ test_expect_success 'log --grep --author implicitly uses all-match' '
+ 	# grep matches initial and second but not third
+ 	# author matches only initial and third
+ 	git log --author="A U Thor" --grep=s --grep=l --format=%s >actual &&
+ 	echo initial >expect &&
+ 	test_cmp expect actual
+ '
+ 
+ test_expect_success 'grep with CE_VALID file' '
+ 	git update-index --assume-unchanged t/t &&
+ 	rm t/t &&
+ 	test "$(git grep test)" = "t/t:test" &&
+ 	git update-index --no-assume-unchanged t/t &&
+ 	git checkout t/t
+ '
+ 
+ cat >expected <<EOF
+ hello.c=#include <stdio.h>
+ hello.c:	return 0;
+ EOF
+ 
+ test_expect_success 'grep -p with userdiff' '
+ 	git config diff.custom.funcname "^#" &&
+ 	echo "hello.c diff=custom" >.gitattributes &&
+ 	git grep -p return >actual &&
+ 	test_cmp expected actual
+ '
+ 
+ cat >expected <<EOF
+ hello.c=int main(int argc, const char **argv)
+ hello.c:	return 0;
+ EOF
+ 
+ test_expect_success 'grep -p' '
+ 	rm -f .gitattributes &&
+ 	git grep -p return >actual &&
+ 	test_cmp expected actual
+ '
+ 
+ cat >expected <<EOF
+ hello.c-#include <stdio.h>
+ hello.c=int main(int argc, const char **argv)
+ hello.c-{
+ hello.c-	printf("Hello world.\n");
+ hello.c:	return 0;
+ EOF
+ 
+ test_expect_success 'grep -p -B5' '
+ 	git grep -p -B5 return >actual &&
+ 	test_cmp expected actual
+ '
+ 
+ test_expect_success 'grep from a subdirectory to search wider area (1)' '
+ 	mkdir -p s &&
+ 	(
+ 		cd s && git grep "x x x" ..
+ 	)
+ '
+ 
+ test_expect_success 'grep from a subdirectory to search wider area (2)' '
+ 	mkdir -p s &&
+ 	(
+ 		cd s || exit 1
+ 		( git grep xxyyzz .. >out ; echo $? >status )
+ 		! test -s out &&
+ 		test 1 = $(cat status)
+ 	)
+ '
+ 
+ cat >expected <<EOF
+ hello.c:int main(int argc, const char **argv)
+ EOF
+ 
+ test_expect_success 'grep -Fi' '
+ 	git grep -Fi "CHAR *" >actual &&
+ 	test_cmp expected actual
+ '
+ 
+ test_expect_success 'outside of git repository' '
+ 	rm -fr non &&
+ 	mkdir -p non/git/sub &&
+ 	echo hello >non/git/file1 &&
+ 	echo world >non/git/sub/file2 &&
+ 	echo ".*o*" >non/git/.gitignore &&
+ 	{
+ 		echo file1:hello &&
+ 		echo sub/file2:world
+ 	} >non/expect.full &&
+ 	echo file2:world >non/expect.sub
+ 	(
+ 		GIT_CEILING_DIRECTORIES="$(pwd)/non/git" &&
+ 		export GIT_CEILING_DIRECTORIES &&
+ 		cd non/git &&
+ 		test_must_fail git grep o &&
+ 		git grep --no-index o >../actual.full &&
+ 		test_cmp ../expect.full ../actual.full
+ 		cd sub &&
+ 		test_must_fail git grep o &&
+ 		git grep --no-index o >../../actual.sub &&
+ 		test_cmp ../../expect.sub ../../actual.sub
+ 	)
+ '
+ 
+ test_expect_success 'inside git repository but with --no-index' '
+ 	rm -fr is &&
+ 	mkdir -p is/git/sub &&
+ 	echo hello >is/git/file1 &&
+ 	echo world >is/git/sub/file2 &&
+ 	echo ".*o*" >is/git/.gitignore &&
+ 	{
+ 		echo file1:hello &&
+ 		echo sub/file2:world
+ 	} >is/expect.full &&
+ 	: >is/expect.empty &&
+ 	echo file2:world >is/expect.sub
+ 	(
+ 		cd is/git &&
+ 		git init &&
+ 		test_must_fail git grep o >../actual.full &&
+ 		test_cmp ../expect.empty ../actual.full &&
+ 		git grep --no-index o >../actual.full &&
+ 		test_cmp ../expect.full ../actual.full &&
+ 		cd sub &&
+ 		test_must_fail git grep o >../../actual.sub &&
+ 		test_cmp ../../expect.empty ../../actual.sub &&
+ 		git grep --no-index o >../../actual.sub &&
+ 		test_cmp ../../expect.sub ../../actual.sub
+ 	)
+ '
+ 
+ test_expect_success 'setup double-dash tests' '
+ cat >double-dash <<EOF &&
+ --
+ ->
+ other
+ EOF
+ git add double-dash
+ '
+ 
+ cat >expected <<EOF
+ double-dash:->
+ EOF
+ test_expect_success 'grep -- pattern' '
+ 	git grep -- "->" >actual &&
+ 	test_cmp expected actual
+ '
+ test_expect_success 'grep -- pattern -- pathspec' '
+ 	git grep -- "->" -- double-dash >actual &&
+ 	test_cmp expected actual
+ '
+ test_expect_success 'grep -e pattern -- path' '
+ 	git grep -e "->" -- double-dash >actual &&
+ 	test_cmp expected actual
+ '
+ 
+ cat >expected <<EOF
+ double-dash:--
+ EOF
+ test_expect_success 'grep -e -- -- path' '
+ 	git grep -e -- -- double-dash >actual &&
+ 	test_cmp expected actual
+ '
+ 
+ test_done