Merge branch 'jk/config-path-include-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 18 Mar 2014 21:00:15 +0000 (14:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 18 Mar 2014 21:00:15 +0000 (14:00 -0700)
include.path variable (or any variable that expects a path that can
use ~username expansion) in the configuration file is not a boolean,
but the code failed to check it.

* jk/config-path-include-fix:
handle_path_include: don't look at NULL value
expand_user_path: do not look at NULL path

1  2 
config.c
path.c
diff --cc config.c
Simple merge
diff --cc path.c
Simple merge