From: Junio C Hamano <junkio@cox.net>
Date: Fri, 21 Apr 2006 20:14:30 +0000 (-0700)
Subject: Merge branch 'fix'
X-Git-Tag: v1.4.0-rc1~228
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/285755127a1ce800ce6a95516a37dd342c57c562?ds=inline;hp=-c

Merge branch 'fix'

* fix:
git-log produces no output
---

285755127a1ce800ce6a95516a37dd342c57c562
diff --combined pager.c
index b063353d96,f7b8e78712..9a30939016
--- a/pager.c
+++ b/pager.c
@@@ -8,6 -8,7 +8,7 @@@
  static void run_pager(const char *pager)
  {
  	execlp(pager, pager, NULL);
+ 	execl("/bin/sh", "sh", "-c", pager, NULL);
  }
  
  void setup_pager(void)
@@@ -20,7 -21,7 +21,7 @@@
  		return;
  	if (!pager)
  		pager = "less";
 -	else if (!*pager)
 +	else if (!*pager || !strcmp(pager, "cat"))
  		return;
  
  	if (pipe(fd) < 0)
@@@ -47,5 -48,6 +48,6 @@@
  
  	setenv("LESS", "-S", 0);
  	run_pager(pager);
+ 	die("unable to execute pager '%s'", pager);
  	exit(255);
  }