From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 25 Jun 2015 18:02:13 +0000 (-0700)
Subject: Merge branch 'jk/die-on-bogus-worktree-late' into maint
X-Git-Tag: v2.4.5~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f2bd231414fc9c22307971bcc6c5a3a96dec75c1;p=thirdparty%2Fgit.git

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

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
---

f2bd231414fc9c22307971bcc6c5a3a96dec75c1