OSDN Git Service

Merge branch 'nd/init-core-worktree-in-multi-worktree-world'
authorJunio C Hamano <gitster@pobox.com>
Mon, 3 Oct 2016 20:30:34 +0000 (13:30 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 3 Oct 2016 20:30:35 +0000 (13:30 -0700)
commit53eb85e6230e2c09dbc06f88b67e7a3baccc4446
tree6290667f96d15d82b964e5f9ed9db906e8fca616
parent347408496a08f18b49b3646b6bb20d17cce85632
parent822d9406c0b397bac7cfc4fda7b355aa1dd2cc52
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
builtin/clone.c
builtin/init-db.c
cache.h