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

gitster · gitster · commit 9fac0777e16b · 2014-01-13T11:33:35.000-08:00
Just like we give a reasonable default for "less" via the LESS
environment variable, specify a reasonable default for "lv" via the
"LV" environment variable when spawning the pager.

* jn/pager-lv-default-env:
  pager: set LV=-c alongside LESS=FRSX
diff --git a/Documentation/config.txt b/Documentation/config.txt
@@ -567,6 +567,10 @@ be passed to the shell by Git, which will translate the final
 command to `LESS=FRSX less -+S`. The environment tells the command
 to set the `S` option to chop long lines but the command line
 resets it to the default to fold long lines.
++
+Likewise, when the `LV` environment variable is unset, Git sets it
+to `-c`.  You can override this setting by exporting `LV` with
+another value or setting `core.pager` to `lv +c`.
 
 core.whitespace::
 	A comma separated list of common whitespace problems to
diff --git a/git-sh-setup.sh b/git-sh-setup.sh
@@ -159,7 +159,8 @@ git_pager() {
 		GIT_PAGER=cat
 	fi
 	: ${LESS=-FRSX}
-	export LESS
+	: ${LV=-c}
+	export LESS LV
 
 	eval "$GIT_PAGER" '"$@"'
 }
diff --git a/pager.c b/pager.c
@@ -80,8 +80,15 @@ void setup_pager(void)
 	pager_process.use_shell = 1;
 	pager_process.argv = pager_argv;
 	pager_process.in = -1;
-	if (!getenv("LESS")) {
-		static const char *env[] = { "LESS=FRSX", NULL };
+	if (!getenv("LESS") || !getenv("LV")) {
+		static const char *env[3];
+		int i = 0;
+
+		if (!getenv("LESS"))
+			env[i++] = "LESS=FRSX";
+		if (!getenv("LV"))
+			env[i++] = "LV=-c";
+		env[i] = NULL;
 		pager_process.env = env;
 	}
 	if (start_command(&pager_process))
diff --git a/perl/Git/SVN/Log.pm b/perl/Git/SVN/Log.pm
@@ -117,6 +117,7 @@ sub run_pager {
 	}
 	open STDIN, '<&', $rfd or fatal "Can't redirect stdin: $!";
 	$ENV{LESS} ||= 'FRSX';
+	$ENV{LV} ||= '-c';
 	exec $pager or fatal "Can't run pager: $! ($pager)";
 }
 
diff --git a/t/t7006-pager.sh b/t/t7006-pager.sh
@@ -37,6 +37,18 @@ test_expect_failure TTY 'pager runs from subdir' '
 	test_cmp expected actual
 '
 
+test_expect_success TTY 'LESS and LV envvars are set for pagination' '
+	(
+		sane_unset LESS LV &&
+		PAGER="env >pager-env.out" &&
+		export PAGER &&
+
+		test_terminal git log
+	) &&
+	grep ^LESS= pager-env.out &&
+	grep ^LV= pager-env.out
+'
+
 test_expect_success TTY 'some commands do not use a pager' '
 	rm -f paginated.out &&
 	test_terminal git rev-list HEAD &&

Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,8 @@ git_pager() {`
`159`	`159`	`GIT_PAGER=cat`
`160`	`160`	`fi`
`161`	`161`	`: ${LESS=-FRSX}`
`162`		`- export LESS`
	`162`	`+ : ${LV=-c}`
	`163`	`+ export LESS LV`
`163`	`164`
`164`	`165`	`eval "$GIT_PAGER" '"$@"'`
`165`	`166`	`}`
Original file line number	Diff line number	Diff line change
`@@ -117,6 +117,7 @@ sub run_pager {`
`117`	`117`	`}`
`118`	`118`	`open STDIN, '<&', $rfd or fatal "Can't redirect stdin: $!";`
`119`	`119`	`$ENV{LESS} \|\|= 'FRSX';`
	`120`	`+ $ENV{LV} \|\|= '-c';`
`120`	`121`	`exec $pager or fatal "Can't run pager: $! ($pager)";`
`121`	`122`	`}`
`122`	`123`