diff options
| author |  Brandon Williams <bmwill@google.com> | 2017-06-14 11:07:38 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-06-15 12:56:22 -0700 |
| commit | a577fb5fdc53a4729eeedc2922d1461350b92f73 (patch) | |
| tree | 15197dd21a7820432815f55a2e88a38766dd99a3 /builtin/diff-files.c | |
| parent | setup: teach discover_git_directory to respect the commondir (diff) | |
| download | tgif-a577fb5fdc53a4729eeedc2922d1461350b92f73.tar.xz | |
config: respect commondir
Worktrees present an interesting problem when it comes to the config.
Historically we could assume that the per-repository config lives at
'gitdir/config', but since worktrees were introduced this isn't the case
anymore. There is currently no way to specify per-worktree
configuration, and as such the repository config is shared with all
worktrees and is located at 'commondir/config'.
Many users of the config machinery correctly set
'config_options.git_dir' with the repository's commondir, allowing the
config to be properly loaded when operating in a worktree. But other's,
like 'read_early_config()', set 'config_options.git_dir' with the
repository's gitdir which can be incorrect when using worktrees.
To fix this issue, and to make things less ambiguous, lets add a
'commondir' field to the 'config_options' struct and have all callers
properly set both the 'git_dir' and 'commondir' fields so that the
config machinery is able to properly find the repository's config.
Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/diff-files.c')
0 files changed, 0 insertions, 0 deletions