This fixes an regression that was not present in Git for Windows's original core.hideDotFiles patch, but in the shape of the core.hideDotFiles patch that made it into git.git. We fixed it in one big hurry in Git for Windows, and I simply forgot to upstream this right away. Changes since v1: * Clarified in the code comment that our intention is to pick up core.hidedotfiles in the first git_config() call. * Explained in the commit message why we cannot remove the git_config(git_init_db_config, NULL) call from create_default_files(): it would cause a change of behavior with regard to the init.templatedir setting. * Simplified the test case. Johannes Schindelin (1): mingw: respect core.hidedotfiles = false in git-init again builtin/init-db.c | 7 +++++++ t/t0001-init.sh | 11 +++++++++++ 2 files changed, 18 insertions(+) base-commit: e902e9bcae2010bc42648c80ab6adc6c5a16a4a5 Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-131%2Fdscho%2Funhidden-git-v2 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-131/dscho/unhidden-git-v2 Pull-Request: https://github.com/gitgitgadget/git/pull/131 Range-diff vs v1: 1: 008e367d26 ! 1: f187d0d247 mingw: respect core.hidedotfiles = false in git-init again @@ -12,6 +12,12 @@ The fix is obvious: read the (limited, pre-init) config *before* creating the .git/ directory. + Please note that we cannot remove the identical-looking `git_config()` + call from `create_default_files()`: we create the `.git/` directory + between those calls. If we removed it, and if the parent directory is + in a Git worktree, and if that worktree's `.git/config` contained any + `init.templatedir` setting, we would all of a sudden pick that up. + This fixes https://github.com/git-for-windows/git/issues/789 Signed-off-by: Johannes Schindelin <johannes.schindelin@xxxxxx> @@ -29,11 +35,19 @@ return 0; } +@@ + struct strbuf err = STRBUF_INIT; + + /* Just look for `init.templatedir` */ ++ init_db_template_dir = NULL; /* re-set in case it was set before */ + git_config(git_init_db_config, NULL); + + /* @@ } startup_info->have_repository = 1; -+ /* Just look for `init.templatedir` and `core.hidedotfiles` */ ++ /* Just look for `core.hidedotfiles` */ + git_config(git_init_db_config, NULL); + safe_create_dir(git_dir, 0); @@ -50,11 +64,10 @@ +test_expect_success MINGW 'core.hidedotfiles = false' ' + git config --global core.hidedotfiles false && + rm -rf newdir && ++ mkdir newdir && + ( + sane_unset GIT_DIR GIT_WORK_TREE GIT_CONFIG && -+ mkdir newdir && -+ cd newdir && -+ git init ++ git -C newdir init + ) && + ! is_hidden newdir/.git +' -- gitgitgadget
