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: http://git.tremily.us/?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 &&