2014-07-28 12:10:39 +02:00
|
|
|
#!/bin/sh
|
|
|
|
|
|
|
|
test_description='Test git config-set API in different settings'
|
|
|
|
|
|
|
|
. ./test-lib.sh
|
|
|
|
|
|
|
|
# 'check_config get_* section.key value' verifies that the entry for
|
|
|
|
# section.key is 'value'
|
|
|
|
check_config () {
|
|
|
|
if test "$1" = expect_code
|
|
|
|
then
|
|
|
|
expect_code="$2" && shift && shift
|
|
|
|
else
|
|
|
|
expect_code=0
|
|
|
|
fi &&
|
|
|
|
op=$1 key=$2 && shift && shift &&
|
|
|
|
if test $# != 0
|
|
|
|
then
|
|
|
|
printf "%s\n" "$@"
|
|
|
|
fi >expect &&
|
|
|
|
test_expect_code $expect_code test-config "$op" "$key" >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
}
|
|
|
|
|
|
|
|
test_expect_success 'setup default config' '
|
2014-10-14 00:25:38 +02:00
|
|
|
cat >.git/config <<-\EOF
|
2014-07-28 12:10:39 +02:00
|
|
|
[case]
|
|
|
|
penguin = very blue
|
|
|
|
Movie = BadPhysics
|
|
|
|
UPPERCASE = true
|
|
|
|
MixedCase = true
|
|
|
|
my =
|
|
|
|
foo
|
|
|
|
baz = sam
|
|
|
|
[Cores]
|
|
|
|
WhatEver = Second
|
|
|
|
baz = bar
|
|
|
|
[cores]
|
|
|
|
baz = bat
|
|
|
|
[CORES]
|
|
|
|
baz = ball
|
|
|
|
[my "Foo bAr"]
|
|
|
|
hi = mixed-case
|
|
|
|
[my "FOO BAR"]
|
|
|
|
hi = upper-case
|
|
|
|
[my "foo bar"]
|
|
|
|
hi = lower-case
|
|
|
|
[case]
|
|
|
|
baz = bat
|
|
|
|
baz = hask
|
|
|
|
[lamb]
|
|
|
|
chop = 65
|
|
|
|
head = none
|
|
|
|
[goat]
|
|
|
|
legs = 4
|
|
|
|
head = true
|
|
|
|
skin = false
|
|
|
|
nose = 1
|
|
|
|
horns
|
|
|
|
EOF
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'get value for a simple key' '
|
|
|
|
check_config get_value case.penguin "very blue"
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'get value for a key with value as an empty string' '
|
|
|
|
check_config get_value case.my ""
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'get value for a key with value as NULL' '
|
|
|
|
check_config get_value case.foo "(NULL)"
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'upper case key' '
|
|
|
|
check_config get_value case.UPPERCASE "true" &&
|
|
|
|
check_config get_value case.uppercase "true"
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'mixed case key' '
|
|
|
|
check_config get_value case.MixedCase "true" &&
|
|
|
|
check_config get_value case.MIXEDCASE "true" &&
|
|
|
|
check_config get_value case.mixedcase "true"
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'key and value with mixed case' '
|
|
|
|
check_config get_value case.Movie "BadPhysics"
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'key with case sensitive subsection' '
|
|
|
|
check_config get_value "my.Foo bAr.hi" "mixed-case" &&
|
|
|
|
check_config get_value "my.FOO BAR.hi" "upper-case" &&
|
|
|
|
check_config get_value "my.foo bar.hi" "lower-case"
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'key with case insensitive section header' '
|
|
|
|
check_config get_value cores.baz "ball" &&
|
|
|
|
check_config get_value Cores.baz "ball" &&
|
|
|
|
check_config get_value CORES.baz "ball" &&
|
|
|
|
check_config get_value coreS.baz "ball"
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'key with case insensitive section header & variable' '
|
|
|
|
check_config get_value CORES.BAZ "ball" &&
|
|
|
|
check_config get_value cores.baz "ball" &&
|
|
|
|
check_config get_value cores.BaZ "ball" &&
|
|
|
|
check_config get_value cOreS.bAz "ball"
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'find value with misspelled key' '
|
|
|
|
check_config expect_code 1 get_value "my.fOo Bar.hi" "Value not found for \"my.fOo Bar.hi\""
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'find value with the highest priority' '
|
|
|
|
check_config get_value case.baz "hask"
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'find integer value for a key' '
|
|
|
|
check_config get_int lamb.chop 65
|
|
|
|
'
|
|
|
|
|
2014-08-07 13:59:19 +02:00
|
|
|
test_expect_success 'find string value for a key' '
|
|
|
|
check_config get_string case.baz hask &&
|
|
|
|
check_config expect_code 1 get_string case.ba "Value not found for \"case.ba\""
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'check line error when NULL string is queried' '
|
|
|
|
test_expect_code 128 test-config get_string case.foo 2>result &&
|
|
|
|
test_i18ngrep "fatal: .*case\.foo.*\.git/config.*line 7" result
|
|
|
|
'
|
|
|
|
|
2014-07-28 12:10:39 +02:00
|
|
|
test_expect_success 'find integer if value is non parse-able' '
|
|
|
|
check_config expect_code 128 get_int lamb.head
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'find bool value for the entered key' '
|
|
|
|
check_config get_bool goat.head 1 &&
|
|
|
|
check_config get_bool goat.skin 0 &&
|
|
|
|
check_config get_bool goat.nose 1 &&
|
|
|
|
check_config get_bool goat.horns 1 &&
|
|
|
|
check_config get_bool goat.legs 1
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'find multiple values' '
|
|
|
|
check_config get_value_multi case.baz sam bat hask
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'find value from a configset' '
|
|
|
|
cat >config2 <<-\EOF &&
|
|
|
|
[case]
|
|
|
|
baz = lama
|
|
|
|
[my]
|
|
|
|
new = silk
|
|
|
|
[case]
|
|
|
|
baz = ball
|
|
|
|
EOF
|
|
|
|
echo silk >expect &&
|
|
|
|
test-config configset_get_value my.new config2 .git/config >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'find value with highest priority from a configset' '
|
|
|
|
echo hask >expect &&
|
|
|
|
test-config configset_get_value case.baz config2 .git/config >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'find value_list for a key from a configset' '
|
|
|
|
cat >except <<-\EOF &&
|
|
|
|
sam
|
|
|
|
bat
|
|
|
|
hask
|
|
|
|
lama
|
|
|
|
ball
|
|
|
|
EOF
|
|
|
|
test-config configset_get_value case.baz config2 .git/config >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'proper error on non-existent files' '
|
|
|
|
echo "Error (-1) reading configuration file non-existent-file." >expect &&
|
|
|
|
test_expect_code 2 test-config configset_get_value foo.bar non-existent-file 2>actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success POSIXPERM,SANITY 'proper error on non-accessible files' '
|
|
|
|
chmod -r .git/config &&
|
|
|
|
test_when_finished "chmod +r .git/config" &&
|
|
|
|
echo "Error (-1) reading configuration file .git/config." >expect &&
|
|
|
|
test_expect_code 2 test-config configset_get_value foo.bar .git/config 2>actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'proper error on error in default config files' '
|
|
|
|
cp .git/config .git/config.old &&
|
|
|
|
test_when_finished "mv .git/config.old .git/config" &&
|
|
|
|
echo "[" >>.git/config &&
|
2016-02-19 10:16:01 +01:00
|
|
|
echo "fatal: bad config line 34 in file .git/config" >expect &&
|
2014-07-28 12:10:39 +02:00
|
|
|
test_expect_code 128 test-config get_value foo.bar 2>actual &&
|
2016-06-17 22:21:07 +02:00
|
|
|
test_i18ncmp expect actual
|
2014-07-28 12:10:39 +02:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'proper error on error in custom config files' '
|
|
|
|
echo "[" >>syntax-error &&
|
2016-02-19 10:16:01 +01:00
|
|
|
echo "fatal: bad config line 1 in file syntax-error" >expect &&
|
2014-07-28 12:10:39 +02:00
|
|
|
test_expect_code 128 test-config configset_get_value foo.bar syntax-error 2>actual &&
|
2016-06-17 22:21:07 +02:00
|
|
|
test_i18ncmp expect actual
|
2014-07-28 12:10:39 +02:00
|
|
|
'
|
|
|
|
|
2014-08-07 13:59:18 +02:00
|
|
|
test_expect_success 'check line errors for malformed values' '
|
|
|
|
mv .git/config .git/config.old &&
|
|
|
|
test_when_finished "mv .git/config.old .git/config" &&
|
|
|
|
cat >.git/config <<-\EOF &&
|
|
|
|
[alias]
|
|
|
|
br
|
|
|
|
EOF
|
|
|
|
test_expect_code 128 git br 2>result &&
|
2017-06-14 13:35:53 +02:00
|
|
|
test_i18ngrep "missing value for .alias\.br" result &&
|
|
|
|
test_i18ngrep "fatal: .*\.git/config" result &&
|
|
|
|
test_i18ngrep "fatal: .*line 2" result
|
2014-08-07 13:59:18 +02:00
|
|
|
'
|
|
|
|
|
2016-02-24 13:48:11 +01:00
|
|
|
test_expect_success 'error on modifying repo config without repo' '
|
2016-12-16 03:31:59 +01:00
|
|
|
nongit test_must_fail git config a.b c 2>err &&
|
|
|
|
grep "not in a git directory" err
|
2016-02-24 13:48:11 +01:00
|
|
|
'
|
|
|
|
|
2016-05-27 02:32:23 +02:00
|
|
|
cmdline_config="'foo.bar=from-cmdline'"
|
|
|
|
test_expect_success 'iteration shows correct origins' '
|
|
|
|
echo "[foo]bar = from-repo" >.git/config &&
|
|
|
|
echo "[foo]bar = from-home" >.gitconfig &&
|
mingw: fix regression in t1308-config-set
When we tried to fix in 58461bd (t1308: do not get fooled by symbolic
links to the source tree, 2016-06-02) an obscure case where the user
cd's into Git's source code via a symbolic link, a regression was
introduced that affects all test runs on Windows.
The original patch introducing the test case in question was careful to
use `$(pwd)` instead of `$PWD`.
This was done to account for the fact that Git's test suite uses shell
scripting even on Windows, where the shell's Unix-y paths are
incompatible with the main Git executable's idea of paths: it only
accepts Windows paths.
It is an awkward but necessary thing, then, to use `$(pwd)` (which gives
us a Windows path) when interacting with the Git executable and `$PWD`
(which gives the shell's idea of the current working directory in Unix-y
form) for shell scripts, including the test suite itself.
Obviously this broke the use case of the Git maintainer when changing
the working directory into Git's source code directory via a symlink,
i.e. when `$(pwd)` does not agree with `$PWD`.
However, we must not fix that use case at the expense of regressing
another use case.
Let's special-case Windows here, even if it is ugly, for lack of a more
elegant solution.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-07-14 15:58:59 +02:00
|
|
|
if test_have_prereq MINGW
|
|
|
|
then
|
|
|
|
# Use Windows path (i.e. *not* $HOME)
|
|
|
|
HOME_GITCONFIG=$(pwd)/.gitconfig
|
|
|
|
else
|
|
|
|
# Do not get fooled by symbolic links, i.e. $HOME != $(pwd)
|
|
|
|
HOME_GITCONFIG=$HOME/.gitconfig
|
|
|
|
fi &&
|
2016-05-27 02:32:23 +02:00
|
|
|
cat >expect <<-EOF &&
|
|
|
|
key=foo.bar
|
|
|
|
value=from-home
|
|
|
|
origin=file
|
mingw: fix regression in t1308-config-set
When we tried to fix in 58461bd (t1308: do not get fooled by symbolic
links to the source tree, 2016-06-02) an obscure case where the user
cd's into Git's source code via a symbolic link, a regression was
introduced that affects all test runs on Windows.
The original patch introducing the test case in question was careful to
use `$(pwd)` instead of `$PWD`.
This was done to account for the fact that Git's test suite uses shell
scripting even on Windows, where the shell's Unix-y paths are
incompatible with the main Git executable's idea of paths: it only
accepts Windows paths.
It is an awkward but necessary thing, then, to use `$(pwd)` (which gives
us a Windows path) when interacting with the Git executable and `$PWD`
(which gives the shell's idea of the current working directory in Unix-y
form) for shell scripts, including the test suite itself.
Obviously this broke the use case of the Git maintainer when changing
the working directory into Git's source code directory via a symlink,
i.e. when `$(pwd)` does not agree with `$PWD`.
However, we must not fix that use case at the expense of regressing
another use case.
Let's special-case Windows here, even if it is ugly, for lack of a more
elegant solution.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-07-14 15:58:59 +02:00
|
|
|
name=$HOME_GITCONFIG
|
config: add a notion of "scope"
A config callback passed to git_config() doesn't know very
much about the context in which it sees a variable. It can
ask whether the variable comes from a file, and get the file
name. But without analyzing the filename (which is hard to
do accurately), it cannot tell whether it is in system-level
config, user-level config, or repo-specific config.
Generally this doesn't matter; the point of not passing this
to the callback is that it should treat the config the same
no matter where it comes from. But some programs, like
upload-pack, are a special case: we should be able to run
them in an untrusted repository, which means we cannot use
any "dangerous" config from the repository config file (but
it is OK to use it from system or user config).
This patch teaches the config code to record the "scope" of
each variable, and make it available inside config
callbacks, similar to how we give access to the filename.
The scope is the starting source for a particular parsing
operation, and remains the same even if we include other
files (so a .git/config which includes another file will
remain CONFIG_SCOPE_REPO, as it would be similarly
untrusted).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-05-19 00:44:23 +02:00
|
|
|
scope=global
|
2016-05-27 02:32:23 +02:00
|
|
|
|
|
|
|
key=foo.bar
|
|
|
|
value=from-repo
|
|
|
|
origin=file
|
|
|
|
name=.git/config
|
config: add a notion of "scope"
A config callback passed to git_config() doesn't know very
much about the context in which it sees a variable. It can
ask whether the variable comes from a file, and get the file
name. But without analyzing the filename (which is hard to
do accurately), it cannot tell whether it is in system-level
config, user-level config, or repo-specific config.
Generally this doesn't matter; the point of not passing this
to the callback is that it should treat the config the same
no matter where it comes from. But some programs, like
upload-pack, are a special case: we should be able to run
them in an untrusted repository, which means we cannot use
any "dangerous" config from the repository config file (but
it is OK to use it from system or user config).
This patch teaches the config code to record the "scope" of
each variable, and make it available inside config
callbacks, similar to how we give access to the filename.
The scope is the starting source for a particular parsing
operation, and remains the same even if we include other
files (so a .git/config which includes another file will
remain CONFIG_SCOPE_REPO, as it would be similarly
untrusted).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-05-19 00:44:23 +02:00
|
|
|
scope=repo
|
2016-05-27 02:32:23 +02:00
|
|
|
|
|
|
|
key=foo.bar
|
|
|
|
value=from-cmdline
|
|
|
|
origin=command line
|
|
|
|
name=
|
config: add a notion of "scope"
A config callback passed to git_config() doesn't know very
much about the context in which it sees a variable. It can
ask whether the variable comes from a file, and get the file
name. But without analyzing the filename (which is hard to
do accurately), it cannot tell whether it is in system-level
config, user-level config, or repo-specific config.
Generally this doesn't matter; the point of not passing this
to the callback is that it should treat the config the same
no matter where it comes from. But some programs, like
upload-pack, are a special case: we should be able to run
them in an untrusted repository, which means we cannot use
any "dangerous" config from the repository config file (but
it is OK to use it from system or user config).
This patch teaches the config code to record the "scope" of
each variable, and make it available inside config
callbacks, similar to how we give access to the filename.
The scope is the starting source for a particular parsing
operation, and remains the same even if we include other
files (so a .git/config which includes another file will
remain CONFIG_SCOPE_REPO, as it would be similarly
untrusted).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-05-19 00:44:23 +02:00
|
|
|
scope=cmdline
|
2016-05-27 02:32:23 +02:00
|
|
|
EOF
|
|
|
|
GIT_CONFIG_PARAMETERS=$cmdline_config test-config iterate >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
2014-07-28 12:10:39 +02:00
|
|
|
test_done
|