Merge branch 'jk/init-core-worktree-at-root'
commit7502b230ced2de7398a292f3da79467065398044
authorJunio C Hamano <gitster@pobox.com>
Wed, 6 May 2015 04:00:26 +0000 (5 21:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 6 May 2015 04:00:27 +0000 (5 21:00 -0700)
tree1dd93d5f73085bf2bb10a4a40cc99d115c084fb4
parentb02a94d6631bd2169d11d3dc7d2ebc21e2dfca30
parent84ccad8dec1b8675699d70412def098d61456c55
Merge branch 'jk/init-core-worktree-at-root'

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