This replaces the last three patches in nd/setup in pu (from clean up setup_discovered_git_dir to t1020-subdirectory) Changes are: - Retain old behavior of setup_discovered_git_dir() when .git is not explicitly set by set_git_dir(), but later on by setup_git_env(). This helps remove the ugly workaround in set_git_dir() earlier. - Include t0001 tests from Jonathan. You'll see I sneak more patches in from my old nd/setup from time to time, until I push all of them :) - set_git_work_tree() now allows multiple calls as long as the new worktree and the old one is the same, as Junio suggested. - Document update. Turns out not much is needed. Jonathan Nieder (1): t0001: test git init when run via an alias Michael J Gruber (1): t1020-subdirectory: test alias expansion in a subdirectory Nguyán ThÃi Ngác Duy (5): setup: clean up setup_discovered_git_dir() setup: rework setup_explicit_git_dir() Remove all logic from get_git_work_tree() Revert "Documentation: always respect core.worktree if set" git.txt: correct where --work-tree path is relative to Documentation/config.txt | 23 ++--- Documentation/git.txt | 2 +- builtin/init-db.c | 14 ++- cache.h | 1 - environment.c | 32 ++---- setup.c | 208 +++++++++++++++++-------------- t/t0001-init.sh | 56 +++++++++ t/t1020-subdirectory.sh | 8 ++ t/t1510-repo-setup.sh | 310 +++++++++++++++++++++++----------------------- 9 files changed, 360 insertions(+), 294 deletions(-) -- 1.7.3.2.210.g045198 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html