summaryrefslogtreecommitdiff
path: root/streaming.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-10-03 20:30:34 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-10-03 20:30:35 (GMT)
commit53eb85e6230e2c09dbc06f88b67e7a3baccc4446 (patch)
tree6290667f96d15d82b964e5f9ed9db906e8fca616 /streaming.c
parent347408496a08f18b49b3646b6bb20d17cce85632 (diff)
parent822d9406c0b397bac7cfc4fda7b355aa1dd2cc52 (diff)
downloadgit-53eb85e6230e2c09dbc06f88b67e7a3baccc4446.zip
git-53eb85e6230e2c09dbc06f88b67e7a3baccc4446.tar.gz
git-53eb85e6230e2c09dbc06f88b67e7a3baccc4446.tar.bz2
Merge branch 'nd/init-core-worktree-in-multi-worktree-world'
"git init" tried to record core.worktree in the repository's 'config' file when GIT_WORK_TREE environment variable was set and it was different from where GIT_DIR appears as ".git" at its top, but the logic was faulty when .git is a "gitdir:" file that points at the real place, causing trouble in working trees that are managed by "git worktree". This has been corrected. * nd/init-core-worktree-in-multi-worktree-world: init: kill git_link variable init: do not set unnecessary core.worktree init: kill set_git_dir_init() init: call set_git_dir_init() from within init_db() init: correct re-initialization from a linked worktree
Diffstat (limited to 'streaming.c')
0 files changed, 0 insertions, 0 deletions