git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2026-05-03 02:27:35 -05:00
Code Issues Packages Projects Releases 335 Wiki Activity

Merge branch 'unhidden-git'

Browse Source 
It has been reported that core.hideDotFiles=false stopped working...
This topic branch fixes it.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This commit is contained in:
Johannes Schindelin
2017-10-29 16:49:09 +01:00
parent 5f2d847b9f 666a9c0ad6
commit 2219632437
2 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
builtin/init-db.c
View File

@@ -154,6 +154,9 @@ static int git_init_db_config(const char *k, const char *v, void *cb)
if (!strcmp(k, "init.templatedir")) if (!strcmp(k, "init.templatedir"))
return git_config_pathname(&init_db_template_dir, k, v); return git_config_pathname(&init_db_template_dir, k, v);
if (starts_with(k, "core."))
return platform_core_config(k, v, cb);
return 0; return 0;
} }
@@ -360,6 +363,9 @@ int init_db(const char *git_dir, const char *real_git_dir,
} }
startup_info->have_repository = 1; startup_info->have_repository = 1;
/* Just look for `init.templatedir` and `core.hidedotfiles` */
git_config(git_init_db_config, NULL);
safe_create_dir(git_dir, 0); safe_create_dir(git_dir, 0);
init_is_bare_repository = is_bare_repository(); init_is_bare_repository = is_bare_repository();

12
t/t0001-init.sh
View File

@@ -453,6 +453,18 @@ test_expect_success 're-init from a linked worktree' '
) )
' '
test_expect_success MINGW 'core.hidedotfiles = false' '
git config --global core.hidedotfiles false &&
rm -rf newdir &&
(
unset GIT_DIR GIT_WORK_TREE GIT_CONFIG
mkdir newdir &&
cd newdir &&
git init
) &&
! is_hidden newdir/.git
'
test_expect_success MINGW 'redirect std handles' ' test_expect_success MINGW 'redirect std handles' '
GIT_REDIRECT_STDOUT=output.txt git rev-parse --git-dir && GIT_REDIRECT_STDOUT=output.txt git rev-parse --git-dir &&
test .git = "$(cat output.txt)" && test .git = "$(cat output.txt)" &&