summaryrefslogtreecommitdiff
path: root/setup.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-06-21 22:20:44 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-06-24 01:24:00 (GMT)
commit25bf951381a4880c43a3d1c65e6dce651e61148f (patch)
treece9488df264bc29a37b479320fad03c93a470db7 /setup.c
parent05ec6e13aaf33b6a647e1321203a770e697eea9a (diff)
parenta84f3e59ebde9e891275ef8325c432db6bdf950c (diff)
parentdc8441fdb4598f54865a5c783d1f86c1e0bcb6dc (diff)
downloadgit-25bf951381a4880c43a3d1c65e6dce651e61148f.zip
git-25bf951381a4880c43a3d1c65e6dce651e61148f.tar.gz
git-25bf951381a4880c43a3d1c65e6dce651e61148f.tar.bz2
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