tree a6491d24988a63b067193fc852902ae41933b00d
parent 81944e9b54039f8475d1df5c40e5a1055eae14f6
parent 5c4003ca3f0e9ac6d3c8aa3e387ff843bd440411
author Junio C Hamano <gitster@pobox.com> 1489783828 -0700
committer Junio C Hamano <gitster@pobox.com> 1489783828 -0700

Merge branch 'js/early-config'

The start-up sequence of "git" needs to figure out some configured
settings before it finds and set itself up in the location of the
repository and was quite messy due to its "chicken-and-egg" nature.
The code has been restructured.

* js/early-config:
  setup.c: mention unresolved problems
  t1309: document cases where we would want early config not to die()
  setup_git_directory_gently_1(): avoid die()ing
  t1309: test read_early_config()
  read_early_config(): really discover .git/
  read_early_config(): avoid .git/config hack when unneeded
  setup: make read_early_config() reusable
  setup: introduce the discover_git_directory() function
  setup_git_directory_1(): avoid changing global state
  setup: prepare setup_discovered_git_dir() for the root directory
  setup_git_directory(): use is_dir_sep() helper
  t7006: replace dubious test