Merge branch 'jk/config-path-include-fix' into maint
commit6f0166771aadeb069b8952255414d67b643db1bf
authorJunio C Hamano <gitster@pobox.com>
Tue, 18 Mar 2014 21:00:15 +0000 (18 14:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 18 Mar 2014 21:00:15 +0000 (18 14:00 -0700)
tree2494ed3a3a79b40e2a31d5892b33504505425bd6
parent34120a5fb555a24904a85e64554bdcc7bcc17963
parent67beb600563cf28186f44450e528df1ec4d524fd
Merge branch 'jk/config-path-include-fix' into maint

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
config.c
path.c