From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 16 Jun 2015 21:27:06 +0000 (-0700)
Subject: Merge branch 'jk/die-on-bogus-worktree-late'
X-Git-Tag: v2.5.0-rc0~36
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=103b6f9c2b2bbafdbde694f9390fb203f70977f0;p=thirdparty%2Fgit.git

Merge branch 'jk/die-on-bogus-worktree-late'

The setup code used to die when core.bare and core.worktree are set
inconsistently, even for commands that do not need working tree.

* jk/die-on-bogus-worktree-late:
  setup_git_directory: delay core.bare/core.worktree errors
---

103b6f9c2b2bbafdbde694f9390fb203f70977f0