]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c7ca442 fada767)
Merge branch 'jk/die-on-bogus-worktree-late'
authorJunio C Hamano <gitster@pobox.com>
Tue, 16 Jun 2015 21:27:06 +0000 (14:27 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 16 Jun 2015 21:27:06 +0000 (14:27 -0700)
commit103b6f9c2b2bbafdbde694f9390fb203f70977f0
treedbdc12e487fe6474ae9bf661e2a20020ea4cf81etree | snapshot
parentc7ca4424ea5644c6aa2c660a4a0726a75f8f2b84commit | diff
parentfada767463b599951b37bd544379a1d18dcf9370commit | diff
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
setup.c diff1 | diff2 | blob | history
t/t1510-repo-setup.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.