Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-object
commit25bf951381a4880c43a3d1c65e6dce651e61148f
authorJunio C Hamano <gitster@pobox.com>
Wed, 21 Jun 2017 22:20:44 +0000 (21 15:20 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 24 Jun 2017 01:24:00 +0000 (23 18:24 -0700)
treece9488df264bc29a37b479320fad03c93a470db7
parent05ec6e13aaf33b6a647e1321203a770e697eea9a
parenta84f3e59ebde9e891275ef8325c432db6bdf950c
parentdc8441fdb4598f54865a5c783d1f86c1e0bcb6dc
Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-object

* bw/ls-files-sans-the-index:
  ls-files: factor out tag calculation
  ls-files: factor out debug info into a function
  ls-files: convert show_files to take an index
  ls-files: convert show_ce_entry to take an index
  ls-files: convert prune_cache to take an index
  ls-files: convert ce_excluded to take an index
  ls-files: convert show_ru_info to take an index
  ls-files: convert show_other_files to take an index
  ls-files: convert show_killed_files to take an index
  ls-files: convert write_eolinfo to take an index
  ls-files: convert overlay_tree_on_cache to take an index
  tree: convert read_tree to take an index parameter
  convert: convert renormalize_buffer to take an index
  convert: convert convert_to_git to take an index
  convert: convert convert_to_git_filter_fd to take an index
  convert: convert crlf_to_git to take an index
  convert: convert get_cached_convert_stats_ascii to take an index

* bw/config-h:
  config: don't implicitly use gitdir or commondir
  config: respect commondir
  setup: teach discover_git_directory to respect the commondir
  config: don't include config.h by default
  config: remove git_config_iter
  config: create config.h
  alias: use the early config machinery to expand aliases
  t7006: demonstrate a problem with aliases in subdirectories
  t1308: relax the test verifying that empty alias values are disallowed
  help: use early config when autocorrecting aliases
  config: report correct line number upon error
  discover_git_directory(): avoid setting invalid git_dir
102 files changed:
apply.c
archive-tar.c
archive-zip.c
archive.c
attr.c
bisect.c
blame.c
branch.c
builtin/add.c
builtin/am.c
builtin/blame.c
builtin/branch.c
builtin/cat-file.c
builtin/check-ignore.c
builtin/checkout.c
builtin/clean.c
builtin/clone.c
builtin/commit-tree.c
builtin/commit.c
builtin/config.c
builtin/describe.c
builtin/diff-files.c
builtin/diff-index.c
builtin/diff-tree.c
builtin/diff.c
builtin/difftool.c
builtin/fast-export.c
builtin/fetch.c
builtin/fmt-merge-msg.c
builtin/fsck.c
builtin/gc.c
builtin/grep.c
builtin/index-pack.c
builtin/log.c
builtin/ls-files.c
builtin/ls-tree.c
builtin/merge-base.c
builtin/merge.c
builtin/name-rev.c
builtin/notes.c
builtin/pack-objects.c
builtin/pull.c
builtin/push.c
builtin/read-tree.c
builtin/receive-pack.c
builtin/reflog.c
builtin/remote.c
builtin/repack.c
builtin/replace.c
builtin/reset.c
builtin/rev-list.c
builtin/rev-parse.c
builtin/rm.c
builtin/show-branch.c
builtin/submodule--helper.c
builtin/tag.c
builtin/unpack-objects.c
builtin/update-index.c
builtin/verify-commit.c
builtin/worktree.c
cache.h
combine-diff.c
config.c
connect.c
convert.c
credential-cache--daemon.c
diff.c
dir.c
environment.c
fast-import.c
fetch-pack.c
git.c
grep.c
help.c
http-backend.c
ident.c
ll-merge.c
log-tree.c
mailinfo.c
merge-recursive.c
notes-utils.c
notes.c
parse-options.c
pathspec.c
pretty.c
read-cache.c
refs.c
refs/files-backend.c
remote.c
rerere.c
sequencer.c
setup.c
sha1_file.c
sha1_name.c
submodule.c
t/t1300-repo-config.sh
t/t1308-config-set.sh
transport.c
unpack-trees.c
upload-pack.c
wrapper.c
xdiff-interface.c