]> rtime.felk.cvut.cz Git - git.git/commitdiff
projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6930cd1 4b05440)
Merge branch 'jl/some-submodule-config-are-not-boolean' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 18 Sep 2013 18:59:35 +0000 (11:59 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 Sep 2013 18:59:35 +0000 (11:59 -0700)
* jl/some-submodule-config-are-not-boolean:
  avoid segfault on submodule.*.path set to an empty "true"

1  2 
submodule.c patch | diff1 | diff2 | blob | history
t/t7400-submodule-basic.sh patch | diff1 | diff2 | blob | history

diff --cc submodule.c
Simple merge
diff --cc t/t7400-submodule-basic.sh
Simple merge
Git mirror and local development