Merge branch 'jn/pager-lv-default-env'

gitster · gitster · commit 3de92cd16dee · 2014-01-31T10:51:57.000-08:00
A finishing touch to its test.

* jn/pager-lv-default-env:
  pager test: make fake pager consume all its input
diff --git a/t/t7006-pager.sh b/t/t7006-pager.sh
@@ -40,7 +40,7 @@ test_expect_failure TTY 'pager runs from subdir' '
 test_expect_success TTY 'LESS and LV envvars are set for pagination' '
 	(
 		sane_unset LESS LV &&
-		PAGER="env >pager-env.out" &&
+		PAGER="env >pager-env.out; wc" &&
 		export PAGER &&
 
 		test_terminal git log

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ test_expect_failure TTY 'pager runs from subdir' '`
`40`	`40`	`test_expect_success TTY 'LESS and LV envvars are set for pagination' '`
`41`	`41`	`(`
`42`	`42`	`sane_unset LESS LV &&`
`43`		`- PAGER="env >pager-env.out" &&`
	`43`	`+ PAGER="env >pager-env.out; wc" &&`
`44`	`44`	`export PAGER &&`
`45`	`45`
`46`	`46`	`test_terminal git log`