global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-17 22:26:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bw/config-h'

Browse Source 
This backports f31d23a399 (Merge branch 'bw/config-h', 2017-06-24) from
upstream Git's `master` branch, plus a patch that seems to be required
to let the test suite pass.

This topic branch fixes problems when looking up aliases in worktrees.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This commit is contained in:
Johannes Schindelin
2018-06-08 18:36:05 +02:00
parent 77f2e20e23 c4c89e5d76
commit 9c3de4df9f
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config.c
View File

@@ -1668,6 +1668,8 @@ static int do_git_config_sequence(const struct config_options *opts,
if (opts->commondir)
repo_config = mkpathdup("%s/config", opts->commondir);
else if (opts->git_dir)
BUG("git_dir without commondir");
else
repo_config = NULL;