]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 28006fb 67beb60)
Merge branch 'jk/config-path-include-fix'
authorJunio C Hamano <gitster@pobox.com>
Thu, 27 Feb 2014 22:01:25 +0000 (14:01 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 27 Feb 2014 22:01:25 +0000 (14:01 -0800)
commitbfef492d769cbea25c3cd951fe452be85402b160
tree24ef7ae95a661de168165b7927df4b2bf1ceba54tree | snapshot
parent28006fb046ddeaf15f8fe9c7cf2a122e2091451bcommit | diff
parent67beb600563cf28186f44450e528df1ec4d524fdcommit | diff
Merge branch 'jk/config-path-include-fix'

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 diff1 | diff2 | blob | history
path.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.