tree 7296be39100177a980c2e3d5700371f11dd5b03d
parent ac8ddd7ba36751a9f6413bb3921fc6797144717e
parent 4d0efa101bbbc63d8bd1ec0477f027f23b9f573b
author Junio C Hamano <gitster@pobox.com> 1474496123 -0700
committer Junio C Hamano <gitster@pobox.com> 1474496124 -0700

Merge branch 'jk/setup-sequence-update'

There were numerous corner cases in which the configuration files
are read and used or not read at all depending on the directory a
Git command was run, leading to inconsistent behaviour.  The code
to set-up repository access at the beginning of a Git process has
been updated to fix them.

* jk/setup-sequence-update:
  t1007: factor out repeated setup
  init: reset cached config when entering new repo
  init: expand comments explaining config trickery
  config: only read .git/config from configured repos
  test-config: setup git directory
  t1302: use "git -C"
  pager: handle early config
  pager: use callbacks instead of configset
  pager: make pager_program a file-local static
  pager: stop loading git_default_config()
  pager: remove obsolete comment
  diff: always try to set up the repository
  diff: handle --no-index prefixes consistently
  diff: skip implicit no-index check when given --no-index
  patch-id: use RUN_SETUP_GENTLY
  hash-object: always try to set up the git repository