Merge branch 'jk/init-core-worktree-at-root' into maint
commita60abe10f2d54c668966f804bb400d21d08008a3
authorJunio C Hamano <gitster@pobox.com>
Wed, 13 May 2015 21:05:49 +0000 (13 14:05 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 13 May 2015 21:05:49 +0000 (13 14:05 -0700)
treee01f077183fc9b6d85a443404ec1618cae55206d
parentc99fec6e35437f9db228c5a37c676faf844b3fa3
parent84ccad8dec1b8675699d70412def098d61456c55
Merge branch 'jk/init-core-worktree-at-root' into maint

We avoid setting core.worktree when the repository location is the
".git" directory directly at the top level of the working tree, but
the code misdetected the case in which the working tree is at the
root level of the filesystem (which arguably is a silly thing to
do, but still valid).

* jk/init-core-worktree-at-root:
  init: don't set core.worktree when initializing /.git
builtin/init-db.c