| commit | f2bd231414fc9c22307971bcc6c5a3a96dec75c1 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 25 Jun 2015 18:02:13 +0000 (25 11:02 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 25 Jun 2015 18:02:13 +0000 (25 11:02 -0700) | ||
| tree | c6e0d5dfb2d6c9aac571b294d604b0e332e44ef0 | treesnapshot (tar.gz zip) |
| parent | 6356003c80c744eefdd49d76bb587184d900228f | commitdiff |
| parent | fada767463b599951b37bd544379a1d18dcf9370 | commitdiff |
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
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