Browse Source

Merge branch 'cn/config-missing-path' into maint

* cn/config-missing-path:
  config: don't segfault when given --path with a missing value
maint
Junio C Hamano 12 years ago
parent
commit
ccf1bb3ab6
  1. 3
      builtin/config.c
  2. 5
      t/t1300-repo-config.sh

3
builtin/config.c

@ -129,7 +129,8 @@ static int show_config(const char *key_, const char *value_, void *cb) @@ -129,7 +129,8 @@ static int show_config(const char *key_, const char *value_, void *cb)
else
sprintf(value, "%d", v);
} else if (types == TYPE_PATH) {
git_config_pathname(&vptr, key_, value_);
if (git_config_pathname(&vptr, key_, value_) < 0)
return -1;
must_free_vptr = 1;
} else if (value_) {
vptr = value_;

5
t/t1300-repo-config.sh

@ -803,6 +803,11 @@ test_expect_success NOT_MINGW 'get --path copes with unset $HOME' ' @@ -803,6 +803,11 @@ test_expect_success NOT_MINGW 'get --path copes with unset $HOME' '
test_cmp expect result
'

test_expect_success 'get --path barfs on boolean variable' '
echo "[path]bool" >.git/config &&
test_must_fail git config --get --path path.bool
'

cat > expect << EOF
[quote]
leading = " test"

Loading…
Cancel
Save