Merge branch 'jn/paginate-fix'
authorJunio C Hamano <gitster@pobox.com>
Tue, 31 Aug 2010 23:23:31 +0000 (16:23 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 31 Aug 2010 23:23:31 +0000 (16:23 -0700)
commit633142d86874ee8ce79a23ee4346f32e6271faad
tree8096e26f84075d3aae42d13fe0b76c2a5f2ea07c
parent693fefe3d022767975eec7585561bfe178b873f4
parent41bf3bc232cf5f99fdc6d3d729536a4c4821d3bd
Merge branch 'jn/paginate-fix'

* jn/paginate-fix:
  t7006 (pager): add missing TTY prerequisites
  merge-file: run setup_git_directory_gently() sooner
  var: run setup_git_directory_gently() sooner
  ls-remote: run setup_git_directory_gently() sooner
  index-pack: run setup_git_directory_gently() sooner
  config: run setup_git_directory_gently() sooner
  bundle: run setup_git_directory_gently() sooner
  apply: run setup_git_directory_gently() sooner
  grep: run setup_git_directory_gently() sooner
  shortlog: run setup_git_directory_gently() sooner
  git wrapper: allow setup_git_directory_gently() be called earlier
  setup: remember whether repository was found
  git wrapper: introduce startup_info struct

Conflicts:
builtin/index-pack.c
builtin/apply.c
builtin/config.c
builtin/grep.c
builtin/index-pack.c
cache.h
git.c
setup.c