Merge branch 'maint'

* maint:
  git-svn: don't attempt to spawn pager if we don't want one
  Supplant the "while case ... break ;; esac" idiom
  User Manual: add a chapter for submodules
  user-manual: don't assume refs are stored under .git/refs
  Detect exec bit in more cases.
  Conjugate "search" correctly in the git-prune-packed man page.
  Move the paragraph specifying where the .idx and .pack files should be
  Documentation/git-lost-found.txt: drop unnecessarily duplicated name.
This commit is contained in:
Junio C Hamano
2007-09-23 17:13:55 -07:00
25 changed files with 252 additions and 38 deletions

View File

@ -3578,7 +3578,7 @@ sub config_pager {
}
sub run_pager {
return unless -t *STDOUT;
return unless -t *STDOUT && defined $pager;
pipe my $rfd, my $wfd or return;
defined(my $pid = fork) or ::fatal "Can't fork: $!\n";
if (!$pid) {