]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5812b3f dc8441f)
Merge branch 'bw/config-h'
authorJunio C Hamano <gitster@pobox.com>
Sat, 24 Jun 2017 21:28:40 +0000 (14:28 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 24 Jun 2017 21:28:41 +0000 (14:28 -0700)
commitf31d23a399d557d687266b4375a0436f920cc051
tree4f163d684ab6b66476e8795a7ea4fce4f2aa5037tree | snapshot
parent5812b3f73b0d319650032833840278fd556fecf3commit | diff
parentdc8441fdb4598f54865a5c783d1f86c1e0bcb6dccommit | diff
Merge branch 'bw/config-h'

Fix configuration codepath to pay proper attention to commondir
that is used in multi-worktree situation, and isolate config API
into its own header file.

* 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
98 files changed:
apply.c diff1 | diff2 | blob | history
archive-tar.c diff1 | diff2 | blob | history
archive-zip.c diff1 | diff2 | blob | history
archive.c diff1 | diff2 | blob | history
attr.c diff1 | diff2 | blob | history
bisect.c diff1 | diff2 | blob | history
branch.c diff1 | diff2 | blob | history
builtin/add.c diff1 | diff2 | blob | history
builtin/am.c diff1 | diff2 | blob | history
builtin/blame.c diff1 | diff2 | blob | history
builtin/branch.c diff1 | diff2 | blob | history
builtin/cat-file.c diff1 | diff2 | blob | history
builtin/check-ignore.c diff1 | diff2 | blob | history
builtin/checkout.c diff1 | diff2 | blob | history
builtin/clean.c diff1 | diff2 | blob | history
builtin/clone.c diff1 | diff2 | blob | history
builtin/commit-tree.c diff1 | diff2 | blob | history
builtin/commit.c diff1 | diff2 | blob | history
builtin/config.c diff1 | diff2 | blob | history
builtin/describe.c diff1 | diff2 | blob | history
builtin/diff-files.c diff1 | diff2 | blob | history
builtin/diff-index.c diff1 | diff2 | blob | history
builtin/diff-tree.c diff1 | diff2 | blob | history
builtin/diff.c diff1 | diff2 | blob | history
builtin/difftool.c diff1 | diff2 | blob | history
builtin/fast-export.c diff1 | diff2 | blob | history
builtin/fetch.c diff1 | diff2 | blob | history
builtin/fmt-merge-msg.c diff1 | diff2 | blob | history
builtin/fsck.c diff1 | diff2 | blob | history
builtin/gc.c diff1 | diff2 | blob | history
builtin/grep.c diff1 | diff2 | blob | history
builtin/index-pack.c diff1 | diff2 | blob | history
builtin/log.c diff1 | diff2 | blob | history
builtin/ls-files.c diff1 | diff2 | blob | history
builtin/ls-tree.c diff1 | diff2 | blob | history
builtin/merge-base.c diff1 | diff2 | blob | history
builtin/merge.c diff1 | diff2 | blob | history
builtin/name-rev.c diff1 | diff2 | blob | history
builtin/notes.c diff1 | diff2 | blob | history
builtin/pack-objects.c diff1 | diff2 | blob | history
builtin/pull.c diff1 | diff2 | blob | history
builtin/push.c diff1 | diff2 | blob | history
builtin/read-tree.c diff1 | diff2 | blob | history
builtin/receive-pack.c diff1 | diff2 | blob | history
builtin/reflog.c diff1 | diff2 | blob | history
builtin/remote.c diff1 | diff2 | blob | history
builtin/repack.c diff1 | diff2 | blob | history
builtin/replace.c diff1 | diff2 | blob | history
builtin/reset.c diff1 | diff2 | blob | history
builtin/rev-list.c diff1 | diff2 | blob | history
builtin/rev-parse.c diff1 | diff2 | blob | history
builtin/rm.c diff1 | diff2 | blob | history
builtin/show-branch.c diff1 | diff2 | blob | history
builtin/submodule--helper.c diff1 | diff2 | blob | history
builtin/tag.c diff1 | diff2 | blob | history
builtin/unpack-objects.c diff1 | diff2 | blob | history
builtin/update-index.c diff1 | diff2 | blob | history
builtin/verify-commit.c diff1 | diff2 | blob | history
builtin/worktree.c diff1 | diff2 | blob | history
cache.h diff1 | diff2 | blob | history
config.c diff1 | diff2 | blob | history
connect.c diff1 | diff2 | blob | history
convert.c diff1 | diff2 | blob | history
credential-cache--daemon.c diff1 | diff2 | blob | history
diff.c diff1 | diff2 | blob | history
dir.c diff1 | diff2 | blob | history
environment.c diff1 | diff2 | blob | history
fast-import.c diff1 | diff2 | blob | history
fetch-pack.c diff1 | diff2 | blob | history
git.c diff1 | diff2 | blob | history
grep.c diff1 | diff2 | blob | history
help.c diff1 | diff2 | blob | history
http-backend.c diff1 | diff2 | blob | history
ident.c diff1 | diff2 | blob | history
ll-merge.c diff1 | diff2 | blob | history
log-tree.c diff1 | diff2 | blob | history
mailinfo.c diff1 | diff2 | blob | history
merge-recursive.c diff1 | diff2 | blob | history
notes-utils.c diff1 | diff2 | blob | history
notes.c diff1 | diff2 | blob | history
parse-options.c diff1 | diff2 | blob | history
pathspec.c diff1 | diff2 | blob | history
pretty.c diff1 | diff2 | blob | history
read-cache.c diff1 | diff2 | blob | history
refs.c diff1 | diff2 | blob | history
refs/files-backend.c diff1 | diff2 | blob | history
remote.c diff1 | diff2 | blob | history
rerere.c diff1 | diff2 | blob | history
sequencer.c diff1 | diff2 | blob | history
setup.c diff1 | diff2 | blob | history
sha1_file.c diff1 | diff2 | blob | history
sha1_name.c diff1 | diff2 | blob | history
submodule.c diff1 | diff2 | blob | history
transport.c diff1 | diff2 | blob | history
unpack-trees.c diff1 | diff2 | blob | history
upload-pack.c diff1 | diff2 | blob | history
wrapper.c diff1 | diff2 | blob | history
xdiff-interface.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.