git.99rst.org Git - git.git/commit

author	Junio C Hamano <redacted>
	Tue, 16 Jun 2015 21:27:06 +0000 (14:27 -0700)
committer	Junio C Hamano <redacted>
	Tue, 16 Jun 2015 21:27:06 +0000 (14:27 -0700)
commit	103b6f9c2b2bbafdbde694f9390fb203f70977f0
tree	dbdc12e487fe6474ae9bf661e2a20020ea4cf81e	tree \| snapshot
parent	c7ca4424ea5644c6aa2c660a4a0726a75f8f2b84	commit \| diff
parent	fada767463b599951b37bd544379a1d18dcf9370	commit \| 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

RSS Atom

git clone https://git.99rst.org/PROJECT

setup.c	diff1 \|	diff2 \|	blob \| history
t/t1510-repo-setup.sh	diff1 \|	diff2 \|	blob \| history