Merge branch 'jk/pager-in-use'

gitster · gitster · commit 6a5ff7acb596 · 2017-03-28T14:05:59.000-07:00
Code clean-up.

* jk/pager-in-use:
  pager_in_use: use git_env_bool()
diff --git a/pager.c b/pager.c
@@ -135,9 +135,7 @@ void setup_pager(void)
 
 int pager_in_use(void)
 {
-	const char *env;
-	env = getenv("GIT_PAGER_IN_USE");
-	return env ? git_config_bool("GIT_PAGER_IN_USE", env) : 0;
+	return git_env_bool("GIT_PAGER_IN_USE", 0);
 }
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -135,9 +135,7 @@ void setup_pager(void)`
`135`	`135`
`136`	`136`	`int pager_in_use(void)`
`137`	`137`	`{`
`138`		`- const char *env;`
`139`		`- env = getenv("GIT_PAGER_IN_USE");`
`140`		`- return env ? git_config_bool("GIT_PAGER_IN_USE", env) : 0;`
	`138`	`+ return git_env_bool("GIT_PAGER_IN_USE", 0);`
`141`	`139`	`}`
`142`	`140`
`143`	`141`	`/*`