Merge branch 'fix'

Junio C Hamano · Junio C Hamano · commit 285755127a1c · 2006-04-21T13:14:30.000-07:00
* fix:
  git-log produces no output
diff --git a/pager.c b/pager.c
@@ -8,6 +8,7 @@
 static void run_pager(const char *pager)
 {
 	execlp(pager, pager, NULL);
+	execl("/bin/sh", "sh", "-c", pager, NULL);
 }
 
 void setup_pager(void)
@@ -47,5 +48,6 @@ void setup_pager(void)
 
 	setenv("LESS", "-S", 0);
 	run_pager(pager);
+	die("unable to execute pager '%s'", pager);
 	exit(255);
 }

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`static void run_pager(const char *pager)`
`9`	`9`	`{`
`10`	`10`	`execlp(pager, pager, NULL);`
	`11`	`+ execl("/bin/sh", "sh", "-c", pager, NULL);`
`11`	`12`	`}`
`12`	`13`
`13`	`14`	`void setup_pager(void)`
`@@ -47,5 +48,6 @@ void setup_pager(void)`
`47`	`48`
`48`	`49`	`setenv("LESS", "-S", 0);`
`49`	`50`	`run_pager(pager);`
	`51`	`+ die("unable to execute pager '%s'", pager);`
`50`	`52`	`exit(255);`
`51`	`53`	`}`