2005-11-18 00:50:08 +03:00
|
|
|
#!/bin/sh
|
|
|
|
#
|
|
|
|
# Copyright (c) 2005 Johannes Schindelin
|
|
|
|
#
|
|
|
|
|
2007-07-03 09:52:14 +04:00
|
|
|
test_description='Test git config in different settings'
|
2005-11-18 00:50:08 +03:00
|
|
|
|
|
|
|
. ./test-lib.sh
|
|
|
|
|
2011-10-12 22:29:20 +04:00
|
|
|
test_expect_success 'clear default config' '
|
|
|
|
rm -f .git/config
|
|
|
|
'
|
2005-11-18 00:50:08 +03:00
|
|
|
|
|
|
|
cat > expect << EOF
|
|
|
|
[core]
|
|
|
|
penguin = little blue
|
|
|
|
EOF
|
2011-10-12 22:29:20 +04:00
|
|
|
test_expect_success 'initial' '
|
|
|
|
git config core.penguin "little blue" &&
|
|
|
|
test_cmp expect .git/config
|
|
|
|
'
|
2005-11-18 00:50:08 +03:00
|
|
|
|
|
|
|
cat > expect << EOF
|
|
|
|
[core]
|
|
|
|
penguin = little blue
|
|
|
|
Movie = BadPhysics
|
|
|
|
EOF
|
2011-10-12 22:29:20 +04:00
|
|
|
test_expect_success 'mixed case' '
|
|
|
|
git config Core.Movie BadPhysics &&
|
|
|
|
test_cmp expect .git/config
|
|
|
|
'
|
2005-11-18 00:50:08 +03:00
|
|
|
|
|
|
|
cat > expect << EOF
|
|
|
|
[core]
|
|
|
|
penguin = little blue
|
|
|
|
Movie = BadPhysics
|
|
|
|
[Cores]
|
|
|
|
WhatEver = Second
|
|
|
|
EOF
|
2011-10-12 22:29:20 +04:00
|
|
|
test_expect_success 'similar section' '
|
2011-12-08 17:10:17 +04:00
|
|
|
git config Cores.WhatEver Second &&
|
2011-10-12 22:29:20 +04:00
|
|
|
test_cmp expect .git/config
|
|
|
|
'
|
2005-11-18 00:50:08 +03:00
|
|
|
|
|
|
|
cat > expect << EOF
|
|
|
|
[core]
|
|
|
|
penguin = little blue
|
|
|
|
Movie = BadPhysics
|
|
|
|
UPPERCASE = true
|
|
|
|
[Cores]
|
|
|
|
WhatEver = Second
|
|
|
|
EOF
|
2011-10-12 22:29:20 +04:00
|
|
|
test_expect_success 'uppercase section' '
|
|
|
|
git config CORE.UPPERCASE true &&
|
|
|
|
test_cmp expect .git/config
|
|
|
|
'
|
2005-11-18 00:50:08 +03:00
|
|
|
|
2012-10-23 22:59:26 +04:00
|
|
|
test_expect_success 'replace with non-match' '
|
|
|
|
git config core.penguin kingpin !blue
|
|
|
|
'
|
2005-11-20 15:24:18 +03:00
|
|
|
|
2012-10-23 22:59:26 +04:00
|
|
|
test_expect_success 'replace with non-match (actually matching)' '
|
|
|
|
git config core.penguin "very blue" !kingpin
|
|
|
|
'
|
2005-11-20 15:24:18 +03:00
|
|
|
|
|
|
|
cat > expect << EOF
|
|
|
|
[core]
|
|
|
|
penguin = very blue
|
|
|
|
Movie = BadPhysics
|
|
|
|
UPPERCASE = true
|
|
|
|
penguin = kingpin
|
|
|
|
[Cores]
|
|
|
|
WhatEver = Second
|
|
|
|
EOF
|
|
|
|
|
2011-10-12 22:29:20 +04:00
|
|
|
test_expect_success 'non-match result' 'test_cmp expect .git/config'
|
2005-11-20 15:24:18 +03:00
|
|
|
|
2011-10-12 22:30:02 +04:00
|
|
|
test_expect_success 'find mixed-case key by canonical name' '
|
|
|
|
echo Second >expect &&
|
|
|
|
git config cores.whatever >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'find mixed-case key by non-canonical name' '
|
|
|
|
echo Second >expect &&
|
|
|
|
git config CoReS.WhAtEvEr >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'subsections are not canonicalized by git-config' '
|
|
|
|
cat >>.git/config <<-\EOF &&
|
|
|
|
[section.SubSection]
|
|
|
|
key = one
|
|
|
|
[section "SubSection"]
|
|
|
|
key = two
|
|
|
|
EOF
|
|
|
|
echo one >expect &&
|
|
|
|
git config section.subsection.key >actual &&
|
|
|
|
test_cmp expect actual &&
|
|
|
|
echo two >expect &&
|
|
|
|
git config section.SubSection.key >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
2005-11-20 15:24:18 +03:00
|
|
|
|
2008-02-11 03:23:03 +03:00
|
|
|
cat > .git/config <<\EOF
|
|
|
|
[alpha]
|
|
|
|
bar = foo
|
|
|
|
[beta]
|
|
|
|
baz = multiple \
|
|
|
|
lines
|
|
|
|
EOF
|
|
|
|
|
2012-10-23 22:59:26 +04:00
|
|
|
test_expect_success 'unset with cont. lines' '
|
|
|
|
git config --unset beta.baz
|
|
|
|
'
|
2008-02-11 03:23:03 +03:00
|
|
|
|
|
|
|
cat > expect <<\EOF
|
|
|
|
[alpha]
|
|
|
|
bar = foo
|
|
|
|
[beta]
|
|
|
|
EOF
|
|
|
|
|
2011-10-12 22:29:20 +04:00
|
|
|
test_expect_success 'unset with cont. lines is correct' 'test_cmp expect .git/config'
|
2008-02-11 03:23:03 +03:00
|
|
|
|
2005-11-18 00:50:08 +03:00
|
|
|
cat > .git/config << EOF
|
|
|
|
[beta] ; silly comment # another comment
|
|
|
|
noIndent= sillyValue ; 'nother silly comment
|
|
|
|
|
|
|
|
# empty line
|
|
|
|
; comment
|
|
|
|
haha ="beta" # last silly comment
|
2005-11-20 08:52:22 +03:00
|
|
|
haha = hello
|
|
|
|
haha = bello
|
2005-11-18 00:50:08 +03:00
|
|
|
[nextSection] noNewline = ouch
|
|
|
|
EOF
|
|
|
|
|
2005-11-20 08:52:22 +03:00
|
|
|
cp .git/config .git/config2
|
|
|
|
|
2012-10-23 22:59:26 +04:00
|
|
|
test_expect_success 'multiple unset' '
|
|
|
|
git config --unset-all beta.haha
|
|
|
|
'
|
2005-11-20 08:52:22 +03:00
|
|
|
|
|
|
|
cat > expect << EOF
|
|
|
|
[beta] ; silly comment # another comment
|
|
|
|
noIndent= sillyValue ; 'nother silly comment
|
|
|
|
|
|
|
|
# empty line
|
|
|
|
; comment
|
|
|
|
[nextSection] noNewline = ouch
|
|
|
|
EOF
|
|
|
|
|
2012-10-23 22:59:26 +04:00
|
|
|
test_expect_success 'multiple unset is correct' '
|
|
|
|
test_cmp expect .git/config
|
|
|
|
'
|
2005-11-20 08:52:22 +03:00
|
|
|
|
2009-03-17 12:46:37 +03:00
|
|
|
cp .git/config2 .git/config
|
|
|
|
|
|
|
|
test_expect_success '--replace-all missing value' '
|
|
|
|
test_must_fail git config --replace-all beta.haha &&
|
|
|
|
test_cmp .git/config2 .git/config
|
|
|
|
'
|
|
|
|
|
|
|
|
rm .git/config2
|
2005-11-20 08:52:22 +03:00
|
|
|
|
2012-10-23 22:59:26 +04:00
|
|
|
test_expect_success '--replace-all' '
|
|
|
|
git config --replace-all beta.haha gamma
|
|
|
|
'
|
2005-11-20 08:52:22 +03:00
|
|
|
|
|
|
|
cat > expect << EOF
|
|
|
|
[beta] ; silly comment # another comment
|
|
|
|
noIndent= sillyValue ; 'nother silly comment
|
|
|
|
|
|
|
|
# empty line
|
|
|
|
; comment
|
|
|
|
haha = gamma
|
|
|
|
[nextSection] noNewline = ouch
|
|
|
|
EOF
|
|
|
|
|
2012-10-23 22:59:26 +04:00
|
|
|
test_expect_success 'all replaced' '
|
|
|
|
test_cmp expect .git/config
|
|
|
|
'
|
2005-11-18 00:50:08 +03:00
|
|
|
|
|
|
|
cat > expect << EOF
|
|
|
|
[beta] ; silly comment # another comment
|
|
|
|
noIndent= sillyValue ; 'nother silly comment
|
|
|
|
|
|
|
|
# empty line
|
|
|
|
; comment
|
|
|
|
haha = alpha
|
|
|
|
[nextSection] noNewline = ouch
|
|
|
|
EOF
|
2011-10-12 22:29:20 +04:00
|
|
|
test_expect_success 'really mean test' '
|
|
|
|
git config beta.haha alpha &&
|
|
|
|
test_cmp expect .git/config
|
|
|
|
'
|
2005-11-18 00:50:08 +03:00
|
|
|
|
|
|
|
cat > expect << EOF
|
|
|
|
[beta] ; silly comment # another comment
|
|
|
|
noIndent= sillyValue ; 'nother silly comment
|
|
|
|
|
|
|
|
# empty line
|
|
|
|
; comment
|
|
|
|
haha = alpha
|
|
|
|
[nextSection]
|
|
|
|
nonewline = wow
|
|
|
|
EOF
|
2011-10-12 22:29:20 +04:00
|
|
|
test_expect_success 'really really mean test' '
|
|
|
|
git config nextsection.nonewline wow &&
|
|
|
|
test_cmp expect .git/config
|
|
|
|
'
|
2005-11-18 00:50:08 +03:00
|
|
|
|
2012-10-23 22:59:26 +04:00
|
|
|
test_expect_success 'get value' '
|
|
|
|
echo alpha >expect &&
|
|
|
|
git config beta.haha >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
2005-11-18 00:50:08 +03:00
|
|
|
|
|
|
|
cat > expect << EOF
|
|
|
|
[beta] ; silly comment # another comment
|
|
|
|
noIndent= sillyValue ; 'nother silly comment
|
|
|
|
|
|
|
|
# empty line
|
|
|
|
; comment
|
|
|
|
[nextSection]
|
|
|
|
nonewline = wow
|
|
|
|
EOF
|
2011-10-12 22:29:20 +04:00
|
|
|
test_expect_success 'unset' '
|
|
|
|
git config --unset beta.haha &&
|
|
|
|
test_cmp expect .git/config
|
|
|
|
'
|
2005-11-18 00:50:08 +03:00
|
|
|
|
|
|
|
cat > expect << EOF
|
|
|
|
[beta] ; silly comment # another comment
|
|
|
|
noIndent= sillyValue ; 'nother silly comment
|
|
|
|
|
|
|
|
# empty line
|
|
|
|
; comment
|
|
|
|
[nextSection]
|
|
|
|
nonewline = wow
|
|
|
|
NoNewLine = wow2 for me
|
|
|
|
EOF
|
2011-10-12 22:29:20 +04:00
|
|
|
test_expect_success 'multivar' '
|
|
|
|
git config nextsection.NoNewLine "wow2 for me" "for me$" &&
|
|
|
|
test_cmp expect .git/config
|
|
|
|
'
|
2005-11-18 00:50:08 +03:00
|
|
|
|
2012-10-23 22:59:26 +04:00
|
|
|
test_expect_success 'non-match' '
|
|
|
|
git config --get nextsection.nonewline !for
|
|
|
|
'
|
2005-11-20 15:24:18 +03:00
|
|
|
|
2012-10-23 22:59:26 +04:00
|
|
|
test_expect_success 'non-match value' '
|
|
|
|
echo wow >expect &&
|
|
|
|
git config --get nextsection.nonewline !for >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
2005-11-20 15:24:18 +03:00
|
|
|
|
git-config: do not complain about duplicate entries
If git-config is asked for a single value, it will complain
and exit with an error if it finds multiple instances of
that value. This is unlike the usual internal config
parsing, however, which will generally overwrite previous
values, leaving only the final one. For example:
[set a multivar]
$ git config user.email one@example.com
$ git config --add user.email two@example.com
[use the internal parser to fetch it]
$ git var GIT_AUTHOR_IDENT
Your Name <two@example.com> ...
[use git-config to fetch it]
$ git config user.email
one@example.com
error: More than one value for the key user.email: two@example.com
This overwriting behavior is critical for the regular
parser, which starts with the lowest-priority file (e.g.,
/etc/gitconfig) and proceeds to the highest-priority file
($GIT_DIR/config). Overwriting yields the highest priority
value at the end.
Git-config solves this problem by implementing its own
parsing. It goes from highest to lowest priorty, but does
not proceed to the next file if it has seen a value.
So in practice, this distinction never mattered much,
because it only triggered for values in the same file. And
there was not much point in doing that; the real value is in
overwriting values from lower-priority files.
However, this changed with the implementation of config
include files. Now we might see an include overriding a
value from the parent file, which is a sensible thing to do,
but git-config will flag as a duplication.
This patch drops the duplicate detection for git-config and
switches to a pure-overwrite model (for the single case;
--get-all can still be used if callers want to do something
more fancy).
As is shown by the modifications to the test suite, this is
a user-visible change in behavior. An alternative would be
to just change the include case, but this is much cleaner
for a few reasons:
1. If you change the include case, then to what? If you
just stop parsing includes after getting a value, then
you will get a _different_ answer than the regular
config parser (you'll get the first value instead of
the last value). So you'd want to implement overwrite
semantics anyway.
2. Even though it is a change in behavior for git-config,
it is bringing us in line with what the internal
parsers already do.
3. The file-order reimplementation is the only thing
keeping us from sharing more code with the internal
config parser, which will help keep differences to a
minimum.
Going under the assumption that the primary purpose of
git-config is to behave identically to how git's internal
parsing works, this change can be seen as a bug-fix.
Signed-off-by: Jeff King <peff@peff.net>
2012-10-24 00:52:44 +04:00
|
|
|
test_expect_success 'multi-valued get returns final one' '
|
|
|
|
echo "wow2 for me" >expect &&
|
|
|
|
git config --get nextsection.nonewline >actual &&
|
|
|
|
test_cmp expect actual
|
2008-02-01 12:50:53 +03:00
|
|
|
'
|
2005-11-20 08:52:22 +03:00
|
|
|
|
2012-10-24 02:05:49 +04:00
|
|
|
test_expect_success 'multi-valued get-all returns all' '
|
|
|
|
cat >expect <<-\EOF &&
|
|
|
|
wow
|
|
|
|
wow2 for me
|
|
|
|
EOF
|
|
|
|
git config --get-all nextsection.nonewline >actual &&
|
|
|
|
test_cmp expect actual
|
2012-10-23 22:59:26 +04:00
|
|
|
'
|
2005-11-20 08:52:22 +03:00
|
|
|
|
2005-11-18 00:50:08 +03:00
|
|
|
cat > expect << EOF
|
|
|
|
[beta] ; silly comment # another comment
|
|
|
|
noIndent= sillyValue ; 'nother silly comment
|
|
|
|
|
|
|
|
# empty line
|
|
|
|
; comment
|
|
|
|
[nextSection]
|
|
|
|
nonewline = wow3
|
|
|
|
NoNewLine = wow2 for me
|
|
|
|
EOF
|
2011-10-12 22:29:20 +04:00
|
|
|
test_expect_success 'multivar replace' '
|
|
|
|
git config nextsection.nonewline "wow3" "wow$" &&
|
|
|
|
test_cmp expect .git/config
|
|
|
|
'
|
2005-11-18 00:50:08 +03:00
|
|
|
|
2008-02-01 12:50:53 +03:00
|
|
|
test_expect_success 'ambiguous unset' '
|
2008-07-12 19:47:52 +04:00
|
|
|
test_must_fail git config --unset nextsection.nonewline
|
2008-02-01 12:50:53 +03:00
|
|
|
'
|
2005-11-18 00:50:08 +03:00
|
|
|
|
2008-02-01 12:50:53 +03:00
|
|
|
test_expect_success 'invalid unset' '
|
2008-07-12 19:47:52 +04:00
|
|
|
test_must_fail git config --unset somesection.nonewline
|
2008-02-01 12:50:53 +03:00
|
|
|
'
|
2005-11-18 00:50:08 +03:00
|
|
|
|
|
|
|
cat > expect << EOF
|
|
|
|
[beta] ; silly comment # another comment
|
|
|
|
noIndent= sillyValue ; 'nother silly comment
|
|
|
|
|
|
|
|
# empty line
|
|
|
|
; comment
|
|
|
|
[nextSection]
|
|
|
|
NoNewLine = wow2 for me
|
|
|
|
EOF
|
|
|
|
|
2011-10-12 22:29:20 +04:00
|
|
|
test_expect_success 'multivar unset' '
|
|
|
|
git config --unset nextsection.nonewline "wow3$" &&
|
|
|
|
test_cmp expect .git/config
|
|
|
|
'
|
2005-11-18 00:50:08 +03:00
|
|
|
|
2008-07-12 19:47:52 +04:00
|
|
|
test_expect_success 'invalid key' 'test_must_fail git config inval.2key blabla'
|
2005-11-18 00:50:08 +03:00
|
|
|
|
2007-07-03 09:52:14 +04:00
|
|
|
test_expect_success 'correct key' 'git config 123456.a123 987'
|
2005-11-18 00:50:08 +03:00
|
|
|
|
2012-10-23 22:59:26 +04:00
|
|
|
test_expect_success 'hierarchical section' '
|
|
|
|
git config Version.1.2.3eX.Alpha beta
|
|
|
|
'
|
2005-11-20 23:22:19 +03:00
|
|
|
|
|
|
|
cat > expect << EOF
|
|
|
|
[beta] ; silly comment # another comment
|
|
|
|
noIndent= sillyValue ; 'nother silly comment
|
|
|
|
|
|
|
|
# empty line
|
|
|
|
; comment
|
|
|
|
[nextSection]
|
|
|
|
NoNewLine = wow2 for me
|
|
|
|
[123456]
|
|
|
|
a123 = 987
|
2006-05-09 23:24:02 +04:00
|
|
|
[Version "1.2.3eX"]
|
|
|
|
Alpha = beta
|
2005-11-20 23:22:19 +03:00
|
|
|
EOF
|
|
|
|
|
2012-10-23 22:59:26 +04:00
|
|
|
test_expect_success 'hierarchical section value' '
|
|
|
|
test_cmp expect .git/config
|
|
|
|
'
|
2005-11-20 23:22:19 +03:00
|
|
|
|
2006-05-02 16:22:48 +04:00
|
|
|
cat > expect << EOF
|
|
|
|
beta.noindent=sillyValue
|
|
|
|
nextsection.nonewline=wow2 for me
|
|
|
|
123456.a123=987
|
2006-05-16 00:48:22 +04:00
|
|
|
version.1.2.3eX.alpha=beta
|
2006-05-02 16:22:48 +04:00
|
|
|
EOF
|
|
|
|
|
2012-10-23 22:59:26 +04:00
|
|
|
test_expect_success 'working --list' '
|
|
|
|
git config --list > output &&
|
|
|
|
test_cmp expect output
|
|
|
|
'
|
2010-10-21 18:45:44 +04:00
|
|
|
cat > expect << EOF
|
|
|
|
EOF
|
|
|
|
|
|
|
|
test_expect_success '--list without repo produces empty output' '
|
|
|
|
git --git-dir=nonexistent config --list >output &&
|
|
|
|
test_cmp expect output
|
|
|
|
'
|
|
|
|
|
2006-05-02 16:22:48 +04:00
|
|
|
cat > expect << EOF
|
|
|
|
beta.noindent sillyValue
|
|
|
|
nextsection.nonewline wow2 for me
|
|
|
|
EOF
|
|
|
|
|
2012-10-23 22:59:26 +04:00
|
|
|
test_expect_success '--get-regexp' '
|
|
|
|
git config --get-regexp in >output &&
|
|
|
|
test_cmp expect output
|
|
|
|
'
|
2006-05-02 16:22:48 +04:00
|
|
|
|
2006-12-15 15:39:04 +03:00
|
|
|
cat > expect << EOF
|
|
|
|
wow2 for me
|
|
|
|
wow4 for you
|
|
|
|
EOF
|
|
|
|
|
2011-10-12 22:29:20 +04:00
|
|
|
test_expect_success '--add' '
|
|
|
|
git config --add nextsection.nonewline "wow4 for you" &&
|
|
|
|
git config --get-all nextsection.nonewline > output &&
|
|
|
|
test_cmp expect output
|
|
|
|
'
|
2006-12-15 15:39:04 +03:00
|
|
|
|
2006-03-06 08:23:30 +03:00
|
|
|
cat > .git/config << EOF
|
|
|
|
[novalue]
|
|
|
|
variable
|
2008-02-07 08:23:46 +03:00
|
|
|
[emptyvalue]
|
|
|
|
variable =
|
2006-03-06 08:23:30 +03:00
|
|
|
EOF
|
|
|
|
|
2012-10-23 22:59:26 +04:00
|
|
|
test_expect_success 'get variable with no value' '
|
|
|
|
git config --get novalue.variable ^$
|
|
|
|
'
|
2006-03-06 08:23:30 +03:00
|
|
|
|
2012-10-23 22:59:26 +04:00
|
|
|
test_expect_success 'get variable with empty value' '
|
|
|
|
git config --get emptyvalue.variable ^$
|
|
|
|
'
|
2008-02-07 08:23:46 +03:00
|
|
|
|
2007-06-25 18:03:54 +04:00
|
|
|
echo novalue.variable > expect
|
|
|
|
|
2012-10-23 22:59:26 +04:00
|
|
|
test_expect_success 'get-regexp variable with no value' '
|
|
|
|
git config --get-regexp novalue > output &&
|
|
|
|
test_cmp expect output
|
|
|
|
'
|
2007-06-25 18:03:54 +04:00
|
|
|
|
2011-10-10 16:54:51 +04:00
|
|
|
echo 'novalue.variable true' > expect
|
|
|
|
|
2012-10-23 22:59:26 +04:00
|
|
|
test_expect_success 'get-regexp --bool variable with no value' '
|
|
|
|
git config --bool --get-regexp novalue > output &&
|
|
|
|
test_cmp expect output
|
|
|
|
'
|
2011-10-10 16:54:51 +04:00
|
|
|
|
2008-02-07 08:23:46 +03:00
|
|
|
echo 'emptyvalue.variable ' > expect
|
|
|
|
|
2012-10-23 22:59:26 +04:00
|
|
|
test_expect_success 'get-regexp variable with empty value' '
|
|
|
|
git config --get-regexp emptyvalue > output &&
|
|
|
|
test_cmp expect output
|
|
|
|
'
|
2008-02-07 08:23:46 +03:00
|
|
|
|
|
|
|
echo true > expect
|
|
|
|
|
2012-10-23 22:59:26 +04:00
|
|
|
test_expect_success 'get bool variable with no value' '
|
|
|
|
git config --bool novalue.variable > output &&
|
|
|
|
test_cmp expect output
|
|
|
|
'
|
2008-02-07 08:23:46 +03:00
|
|
|
|
|
|
|
echo false > expect
|
|
|
|
|
2012-10-23 22:59:26 +04:00
|
|
|
test_expect_success 'get bool variable with empty value' '
|
|
|
|
git config --bool emptyvalue.variable > output &&
|
|
|
|
test_cmp expect output
|
|
|
|
'
|
2008-02-07 08:23:46 +03:00
|
|
|
|
2009-03-07 20:14:04 +03:00
|
|
|
test_expect_success 'no arguments, but no crash' '
|
|
|
|
test_must_fail git config >output 2>&1 &&
|
2012-08-27 09:36:55 +04:00
|
|
|
test_i18ngrep usage output
|
2009-03-07 20:14:04 +03:00
|
|
|
'
|
2006-05-02 16:22:48 +04:00
|
|
|
|
2006-05-06 23:43:43 +04:00
|
|
|
cat > .git/config << EOF
|
|
|
|
[a.b]
|
|
|
|
c = d
|
|
|
|
EOF
|
|
|
|
|
|
|
|
cat > expect << EOF
|
|
|
|
[a.b]
|
|
|
|
c = d
|
|
|
|
[a]
|
|
|
|
x = y
|
|
|
|
EOF
|
|
|
|
|
2011-10-12 22:29:20 +04:00
|
|
|
test_expect_success 'new section is partial match of another' '
|
|
|
|
git config a.x y &&
|
|
|
|
test_cmp expect .git/config
|
|
|
|
'
|
2006-05-06 23:43:43 +04:00
|
|
|
|
|
|
|
cat > expect << EOF
|
|
|
|
[a.b]
|
|
|
|
c = d
|
|
|
|
[a]
|
|
|
|
x = y
|
|
|
|
b = c
|
|
|
|
[b]
|
|
|
|
x = y
|
|
|
|
EOF
|
|
|
|
|
2011-10-12 22:29:20 +04:00
|
|
|
test_expect_success 'new variable inserts into proper section' '
|
|
|
|
git config b.x y &&
|
|
|
|
git config a.b c &&
|
|
|
|
test_cmp expect .git/config
|
|
|
|
'
|
2006-05-06 23:43:43 +04:00
|
|
|
|
2012-10-23 22:59:26 +04:00
|
|
|
test_expect_success 'alternative GIT_CONFIG (non-existing file should fail)' '
|
|
|
|
test_must_fail git config --file non-existing-config -l
|
|
|
|
'
|
2007-07-31 14:30:52 +04:00
|
|
|
|
2006-06-20 02:51:58 +04:00
|
|
|
cat > other-config << EOF
|
|
|
|
[ein]
|
|
|
|
bahn = strasse
|
|
|
|
EOF
|
|
|
|
|
|
|
|
cat > expect << EOF
|
|
|
|
ein.bahn=strasse
|
|
|
|
EOF
|
|
|
|
|
2011-10-12 22:29:20 +04:00
|
|
|
test_expect_success 'alternative GIT_CONFIG' '
|
|
|
|
GIT_CONFIG=other-config git config -l >output &&
|
|
|
|
test_cmp expect output
|
|
|
|
'
|
2006-06-20 02:51:58 +04:00
|
|
|
|
2012-10-23 22:59:26 +04:00
|
|
|
test_expect_success 'alternative GIT_CONFIG (--file)' '
|
|
|
|
git config --file other-config -l > output &&
|
|
|
|
test_cmp expect output
|
|
|
|
'
|
2007-07-31 14:30:52 +04:00
|
|
|
|
2010-01-26 18:02:16 +03:00
|
|
|
test_expect_success 'refer config from subdirectory' '
|
|
|
|
mkdir x &&
|
|
|
|
(
|
|
|
|
cd x &&
|
2012-02-16 12:02:18 +04:00
|
|
|
echo strasse >expect &&
|
2010-01-26 18:02:16 +03:00
|
|
|
git config --get --file ../other-config ein.bahn >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
)
|
|
|
|
|
|
|
|
'
|
|
|
|
|
config: stop using config_exclusive_filename
The git-config command sometimes operates on the default set
of config files (either reading from all, or writing to repo
config), and sometimes operates on a specific file. In the
latter case, we set the magic global config_exclusive_filename,
and the code in config.c does the right thing.
Instead, let's have git-config use the "advanced" variants
of config.c's functions which let it specify an individual
filename (or NULL for the default). This makes the code a
lot more obvious, and fixes two small bugs:
1. A relative path specified by GIT_CONFIG=foo will look
in the wrong directory if we have to chdir as part of
repository setup. We already handle this properly for
"git config -f foo", but the GIT_CONFIG lookup used
config_exclusive_filename directly. By dropping to a
single magic variable, the GIT_CONFIG case now just
works.
2. Calling "git config -f foo --edit" would not respect
core.editor. This is because just before editing, we
called git_config, which would respect the
config_exclusive_filename setting, even though this
particular git_config call was not about looking in the
user's specified file, but rather about loading actual
git config, just as any other git program would.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-02-16 12:07:32 +04:00
|
|
|
test_expect_success 'refer config from subdirectory via GIT_CONFIG' '
|
|
|
|
(
|
|
|
|
cd x &&
|
|
|
|
GIT_CONFIG=../other-config git config --get ein.bahn >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2006-06-20 02:51:58 +04:00
|
|
|
cat > expect << EOF
|
|
|
|
[ein]
|
|
|
|
bahn = strasse
|
|
|
|
[anwohner]
|
|
|
|
park = ausweis
|
|
|
|
EOF
|
|
|
|
|
2011-10-12 22:29:20 +04:00
|
|
|
test_expect_success '--set in alternative GIT_CONFIG' '
|
|
|
|
GIT_CONFIG=other-config git config anwohner.park ausweis &&
|
|
|
|
test_cmp expect other-config
|
|
|
|
'
|
2006-06-20 02:51:58 +04:00
|
|
|
|
2006-12-16 17:14:14 +03:00
|
|
|
cat > .git/config << EOF
|
|
|
|
# Hallo
|
|
|
|
#Bello
|
|
|
|
[branch "eins"]
|
|
|
|
x = 1
|
|
|
|
[branch.eins]
|
|
|
|
y = 1
|
|
|
|
[branch "1 234 blabl/a"]
|
|
|
|
weird
|
|
|
|
EOF
|
|
|
|
|
2012-10-23 22:59:26 +04:00
|
|
|
test_expect_success 'rename section' '
|
|
|
|
git config --rename-section branch.eins branch.zwei
|
|
|
|
'
|
2006-12-16 17:14:14 +03:00
|
|
|
|
|
|
|
cat > expect << EOF
|
|
|
|
# Hallo
|
|
|
|
#Bello
|
|
|
|
[branch "zwei"]
|
|
|
|
x = 1
|
|
|
|
[branch "zwei"]
|
|
|
|
y = 1
|
|
|
|
[branch "1 234 blabl/a"]
|
|
|
|
weird
|
|
|
|
EOF
|
|
|
|
|
2012-10-23 22:59:26 +04:00
|
|
|
test_expect_success 'rename succeeded' '
|
|
|
|
test_cmp expect .git/config
|
|
|
|
'
|
2006-12-16 17:14:14 +03:00
|
|
|
|
2012-10-23 22:59:26 +04:00
|
|
|
test_expect_success 'rename non-existing section' '
|
2008-07-12 19:47:52 +04:00
|
|
|
test_must_fail git config --rename-section \
|
|
|
|
branch."world domination" branch.drei
|
2008-02-01 12:50:53 +03:00
|
|
|
'
|
2006-12-16 17:14:14 +03:00
|
|
|
|
2012-10-23 22:59:26 +04:00
|
|
|
test_expect_success 'rename succeeded' '
|
|
|
|
test_cmp expect .git/config
|
|
|
|
'
|
2006-12-16 17:14:14 +03:00
|
|
|
|
2012-10-23 22:59:26 +04:00
|
|
|
test_expect_success 'rename another section' '
|
|
|
|
git config --rename-section branch."1 234 blabl/a" branch.drei
|
|
|
|
'
|
2006-12-16 17:14:14 +03:00
|
|
|
|
|
|
|
cat > expect << EOF
|
|
|
|
# Hallo
|
|
|
|
#Bello
|
|
|
|
[branch "zwei"]
|
|
|
|
x = 1
|
|
|
|
[branch "zwei"]
|
|
|
|
y = 1
|
|
|
|
[branch "drei"]
|
|
|
|
weird
|
|
|
|
EOF
|
|
|
|
|
2012-10-23 22:59:26 +04:00
|
|
|
test_expect_success 'rename succeeded' '
|
|
|
|
test_cmp expect .git/config
|
|
|
|
'
|
2009-07-25 01:21:44 +04:00
|
|
|
|
|
|
|
cat >> .git/config << EOF
|
|
|
|
[branch "vier"] z = 1
|
|
|
|
EOF
|
|
|
|
|
2012-10-23 22:59:26 +04:00
|
|
|
test_expect_success 'rename a section with a var on the same line' '
|
|
|
|
git config --rename-section branch.vier branch.zwei
|
|
|
|
'
|
2009-07-25 01:21:44 +04:00
|
|
|
|
|
|
|
cat > expect << EOF
|
|
|
|
# Hallo
|
|
|
|
#Bello
|
|
|
|
[branch "zwei"]
|
|
|
|
x = 1
|
|
|
|
[branch "zwei"]
|
|
|
|
y = 1
|
|
|
|
[branch "drei"]
|
|
|
|
weird
|
|
|
|
[branch "zwei"]
|
|
|
|
z = 1
|
|
|
|
EOF
|
|
|
|
|
2012-10-23 22:59:26 +04:00
|
|
|
test_expect_success 'rename succeeded' '
|
|
|
|
test_cmp expect .git/config
|
|
|
|
'
|
2006-12-16 17:14:14 +03:00
|
|
|
|
2012-04-26 05:47:14 +04:00
|
|
|
test_expect_success 'renaming empty section name is rejected' '
|
|
|
|
test_must_fail git config --rename-section branch.zwei ""
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'renaming to bogus section is rejected' '
|
|
|
|
test_must_fail git config --rename-section branch.zwei "bogus name"
|
|
|
|
'
|
|
|
|
|
2007-03-02 23:53:33 +03:00
|
|
|
cat >> .git/config << EOF
|
|
|
|
[branch "zwei"] a = 1 [branch "vier"]
|
|
|
|
EOF
|
|
|
|
|
2012-10-23 22:59:26 +04:00
|
|
|
test_expect_success 'remove section' '
|
|
|
|
git config --remove-section branch.zwei
|
|
|
|
'
|
2007-03-02 23:53:33 +03:00
|
|
|
|
|
|
|
cat > expect << EOF
|
|
|
|
# Hallo
|
|
|
|
#Bello
|
|
|
|
[branch "drei"]
|
|
|
|
weird
|
|
|
|
EOF
|
|
|
|
|
2012-10-23 22:59:26 +04:00
|
|
|
test_expect_success 'section was removed properly' '
|
|
|
|
test_cmp expect .git/config
|
|
|
|
'
|
2007-03-02 23:53:33 +03:00
|
|
|
|
2007-05-13 11:12:52 +04:00
|
|
|
cat > expect << EOF
|
|
|
|
[gitcvs]
|
|
|
|
enabled = true
|
|
|
|
dbname = %Ggitcvs2.%a.%m.sqlite
|
|
|
|
[gitcvs "ext"]
|
|
|
|
dbname = %Ggitcvs1.%a.%m.sqlite
|
|
|
|
EOF
|
|
|
|
|
|
|
|
test_expect_success 'section ending' '
|
2011-10-19 11:37:06 +04:00
|
|
|
rm -f .git/config &&
|
2007-07-03 09:52:14 +04:00
|
|
|
git config gitcvs.enabled true &&
|
|
|
|
git config gitcvs.ext.dbname %Ggitcvs1.%a.%m.sqlite &&
|
|
|
|
git config gitcvs.dbname %Ggitcvs2.%a.%m.sqlite &&
|
2011-10-12 22:29:20 +04:00
|
|
|
test_cmp expect .git/config
|
2007-05-13 11:12:52 +04:00
|
|
|
|
|
|
|
'
|
|
|
|
|
2006-12-31 06:13:05 +03:00
|
|
|
test_expect_success numbers '
|
2007-07-03 09:52:14 +04:00
|
|
|
git config kilo.gram 1k &&
|
|
|
|
git config mega.ton 1m &&
|
2012-10-23 22:59:26 +04:00
|
|
|
echo 1024 >expect &&
|
|
|
|
echo 1048576 >>expect &&
|
|
|
|
git config --int --get kilo.gram >actual &&
|
|
|
|
git config --int --get mega.ton >>actual &&
|
|
|
|
test_cmp expect actual
|
2006-12-31 06:13:05 +03:00
|
|
|
'
|
|
|
|
|
2007-12-25 10:18:05 +03:00
|
|
|
test_expect_success 'invalid unit' '
|
|
|
|
git config aninvalid.unit "1auto" &&
|
2012-10-23 22:59:26 +04:00
|
|
|
echo 1auto >expect &&
|
|
|
|
git config aninvalid.unit >actual &&
|
|
|
|
test_cmp expect actual &&
|
2013-09-08 12:38:22 +04:00
|
|
|
cat >expect <<-\EOF
|
|
|
|
fatal: bad numeric config value '\''1auto'\'' for '\''aninvalid.unit'\'' in .git/config: invalid unit
|
2012-10-23 22:59:26 +04:00
|
|
|
EOF
|
|
|
|
test_must_fail git config --int --get aninvalid.unit 2>actual &&
|
2013-09-08 12:38:22 +04:00
|
|
|
test_i18ncmp expect actual
|
2007-12-25 10:18:05 +03:00
|
|
|
'
|
|
|
|
|
2007-05-21 02:12:57 +04:00
|
|
|
cat > expect << EOF
|
|
|
|
true
|
|
|
|
false
|
|
|
|
true
|
|
|
|
false
|
|
|
|
true
|
|
|
|
false
|
|
|
|
true
|
|
|
|
false
|
|
|
|
EOF
|
|
|
|
|
|
|
|
test_expect_success bool '
|
|
|
|
|
2007-07-03 09:52:14 +04:00
|
|
|
git config bool.true1 01 &&
|
|
|
|
git config bool.true2 -1 &&
|
|
|
|
git config bool.true3 YeS &&
|
|
|
|
git config bool.true4 true &&
|
|
|
|
git config bool.false1 000 &&
|
|
|
|
git config bool.false2 "" &&
|
|
|
|
git config bool.false3 nO &&
|
|
|
|
git config bool.false4 FALSE &&
|
2007-05-21 02:12:57 +04:00
|
|
|
rm -f result &&
|
|
|
|
for i in 1 2 3 4
|
|
|
|
do
|
2007-07-03 09:52:14 +04:00
|
|
|
git config --bool --get bool.true$i >>result
|
|
|
|
git config --bool --get bool.false$i >>result
|
2007-05-21 02:12:57 +04:00
|
|
|
done &&
|
2012-10-23 22:59:26 +04:00
|
|
|
test_cmp expect result'
|
2007-05-21 02:12:57 +04:00
|
|
|
|
2008-02-01 12:50:53 +03:00
|
|
|
test_expect_success 'invalid bool (--get)' '
|
2007-05-21 02:12:57 +04:00
|
|
|
|
2007-07-03 09:52:14 +04:00
|
|
|
git config bool.nobool foobar &&
|
2008-07-12 19:47:52 +04:00
|
|
|
test_must_fail git config --bool --get bool.nobool'
|
2007-05-21 02:12:57 +04:00
|
|
|
|
2008-02-01 12:50:53 +03:00
|
|
|
test_expect_success 'invalid bool (set)' '
|
2007-06-25 18:00:24 +04:00
|
|
|
|
2008-07-12 19:47:52 +04:00
|
|
|
test_must_fail git config --bool bool.nobool foobar'
|
2007-06-25 18:00:24 +04:00
|
|
|
|
|
|
|
cat > expect <<\EOF
|
|
|
|
[bool]
|
|
|
|
true1 = true
|
|
|
|
true2 = true
|
|
|
|
true3 = true
|
|
|
|
true4 = true
|
|
|
|
false1 = false
|
|
|
|
false2 = false
|
|
|
|
false3 = false
|
|
|
|
false4 = false
|
|
|
|
EOF
|
|
|
|
|
|
|
|
test_expect_success 'set --bool' '
|
|
|
|
|
2011-10-19 11:37:06 +04:00
|
|
|
rm -f .git/config &&
|
2007-07-03 09:52:14 +04:00
|
|
|
git config --bool bool.true1 01 &&
|
|
|
|
git config --bool bool.true2 -1 &&
|
|
|
|
git config --bool bool.true3 YeS &&
|
|
|
|
git config --bool bool.true4 true &&
|
|
|
|
git config --bool bool.false1 000 &&
|
|
|
|
git config --bool bool.false2 "" &&
|
|
|
|
git config --bool bool.false3 nO &&
|
|
|
|
git config --bool bool.false4 FALSE &&
|
2012-10-23 22:59:26 +04:00
|
|
|
test_cmp expect .git/config'
|
2007-06-25 18:00:24 +04:00
|
|
|
|
|
|
|
cat > expect <<\EOF
|
|
|
|
[int]
|
|
|
|
val1 = 1
|
|
|
|
val2 = -1
|
|
|
|
val3 = 5242880
|
|
|
|
EOF
|
|
|
|
|
|
|
|
test_expect_success 'set --int' '
|
|
|
|
|
2011-10-19 11:37:06 +04:00
|
|
|
rm -f .git/config &&
|
2007-07-03 09:52:14 +04:00
|
|
|
git config --int int.val1 01 &&
|
|
|
|
git config --int int.val2 -1 &&
|
|
|
|
git config --int int.val3 5m &&
|
2012-10-23 22:59:26 +04:00
|
|
|
test_cmp expect .git/config
|
|
|
|
'
|
2007-06-25 18:00:24 +04:00
|
|
|
|
2012-10-23 22:59:26 +04:00
|
|
|
test_expect_success 'get --bool-or-int' '
|
|
|
|
cat >.git/config <<-\EOF &&
|
|
|
|
[bool]
|
|
|
|
true1
|
2008-04-13 23:11:11 +04:00
|
|
|
true2 = true
|
2012-10-23 22:59:26 +04:00
|
|
|
false = false
|
|
|
|
[int]
|
2008-04-13 23:11:11 +04:00
|
|
|
int1 = 0
|
|
|
|
int2 = 1
|
|
|
|
int3 = -1
|
2012-10-23 22:59:26 +04:00
|
|
|
EOF
|
|
|
|
cat >expect <<-\EOF &&
|
|
|
|
true
|
|
|
|
true
|
|
|
|
false
|
|
|
|
0
|
|
|
|
1
|
|
|
|
-1
|
|
|
|
EOF
|
|
|
|
{
|
|
|
|
git config --bool-or-int bool.true1 &&
|
|
|
|
git config --bool-or-int bool.true2 &&
|
|
|
|
git config --bool-or-int bool.false &&
|
|
|
|
git config --bool-or-int int.int1 &&
|
|
|
|
git config --bool-or-int int.int2 &&
|
|
|
|
git config --bool-or-int int.int3
|
|
|
|
} >actual &&
|
|
|
|
test_cmp expect actual
|
2008-04-13 23:11:11 +04:00
|
|
|
'
|
|
|
|
|
|
|
|
cat >expect <<\EOF
|
|
|
|
[bool]
|
|
|
|
true1 = true
|
|
|
|
false1 = false
|
|
|
|
true2 = true
|
|
|
|
false2 = false
|
|
|
|
[int]
|
|
|
|
int1 = 0
|
|
|
|
int2 = 1
|
|
|
|
int3 = -1
|
|
|
|
EOF
|
|
|
|
|
|
|
|
test_expect_success 'set --bool-or-int' '
|
2011-10-19 11:37:06 +04:00
|
|
|
rm -f .git/config &&
|
2008-04-13 23:11:11 +04:00
|
|
|
git config --bool-or-int bool.true1 true &&
|
|
|
|
git config --bool-or-int bool.false1 false &&
|
|
|
|
git config --bool-or-int bool.true2 yes &&
|
|
|
|
git config --bool-or-int bool.false2 no &&
|
|
|
|
git config --bool-or-int int.int1 0 &&
|
|
|
|
git config --bool-or-int int.int2 1 &&
|
|
|
|
git config --bool-or-int int.int3 -1 &&
|
|
|
|
test_cmp expect .git/config
|
|
|
|
'
|
|
|
|
|
2009-12-30 19:51:53 +03:00
|
|
|
cat >expect <<\EOF
|
|
|
|
[path]
|
|
|
|
home = ~/
|
|
|
|
normal = /dev/null
|
|
|
|
trailingtilde = foo~
|
|
|
|
EOF
|
|
|
|
|
2010-09-28 01:02:57 +04:00
|
|
|
test_expect_success NOT_MINGW 'set --path' '
|
2011-10-19 11:37:06 +04:00
|
|
|
rm -f .git/config &&
|
2009-12-30 19:51:53 +03:00
|
|
|
git config --path path.home "~/" &&
|
|
|
|
git config --path path.normal "/dev/null" &&
|
|
|
|
git config --path path.trailingtilde "foo~" &&
|
|
|
|
test_cmp expect .git/config'
|
|
|
|
|
2010-09-28 01:02:57 +04:00
|
|
|
if test_have_prereq NOT_MINGW && test "${HOME+set}"
|
2010-07-26 19:06:51 +04:00
|
|
|
then
|
|
|
|
test_set_prereq HOMEVAR
|
|
|
|
fi
|
|
|
|
|
2009-12-30 19:51:53 +03:00
|
|
|
cat >expect <<EOF
|
|
|
|
$HOME/
|
|
|
|
/dev/null
|
|
|
|
foo~
|
|
|
|
EOF
|
|
|
|
|
2010-07-26 19:06:51 +04:00
|
|
|
test_expect_success HOMEVAR 'get --path' '
|
2009-12-30 19:51:53 +03:00
|
|
|
git config --get --path path.home > result &&
|
|
|
|
git config --get --path path.normal >> result &&
|
|
|
|
git config --get --path path.trailingtilde >> result &&
|
|
|
|
test_cmp expect result
|
|
|
|
'
|
|
|
|
|
2010-07-26 19:06:51 +04:00
|
|
|
cat >expect <<\EOF
|
|
|
|
/dev/null
|
|
|
|
foo~
|
|
|
|
EOF
|
|
|
|
|
2010-09-28 01:02:57 +04:00
|
|
|
test_expect_success NOT_MINGW 'get --path copes with unset $HOME' '
|
2010-07-26 19:06:51 +04:00
|
|
|
(
|
|
|
|
unset HOME;
|
|
|
|
test_must_fail git config --get --path path.home \
|
|
|
|
>result 2>msg &&
|
|
|
|
git config --get --path path.normal >>result &&
|
|
|
|
git config --get --path path.trailingtilde >>result
|
|
|
|
) &&
|
|
|
|
grep "[Ff]ailed to expand.*~/" msg &&
|
|
|
|
test_cmp expect result
|
|
|
|
'
|
|
|
|
|
2012-11-15 22:10:01 +04:00
|
|
|
test_expect_success 'get --path barfs on boolean variable' '
|
|
|
|
echo "[path]bool" >.git/config &&
|
|
|
|
test_must_fail git config --get --path path.bool
|
|
|
|
'
|
|
|
|
|
2007-01-09 08:27:41 +03:00
|
|
|
cat > expect << EOF
|
|
|
|
[quote]
|
|
|
|
leading = " test"
|
|
|
|
ending = "test "
|
|
|
|
semicolon = "test;test"
|
|
|
|
hash = "test#test"
|
|
|
|
EOF
|
2011-10-12 22:29:20 +04:00
|
|
|
test_expect_success 'quoting' '
|
2011-10-19 11:37:06 +04:00
|
|
|
rm -f .git/config &&
|
2011-10-12 22:29:20 +04:00
|
|
|
git config quote.leading " test" &&
|
|
|
|
git config quote.ending "test " &&
|
|
|
|
git config quote.semicolon "test;test" &&
|
|
|
|
git config quote.hash "test#test" &&
|
|
|
|
test_cmp expect .git/config
|
|
|
|
'
|
2007-01-09 08:27:41 +03:00
|
|
|
|
2008-02-01 12:50:53 +03:00
|
|
|
test_expect_success 'key with newline' '
|
2008-07-12 19:47:52 +04:00
|
|
|
test_must_fail git config "key.with
|
2008-02-01 12:50:53 +03:00
|
|
|
newline" 123'
|
2007-01-20 04:25:37 +03:00
|
|
|
|
2007-01-29 03:16:53 +03:00
|
|
|
test_expect_success 'value with newline' 'git config key.sub value.with\\\
|
2007-01-20 04:25:37 +03:00
|
|
|
newline'
|
|
|
|
|
2007-01-23 15:37:25 +03:00
|
|
|
cat > .git/config <<\EOF
|
|
|
|
[section]
|
|
|
|
; comment \
|
|
|
|
continued = cont\
|
|
|
|
inued
|
|
|
|
noncont = not continued ; \
|
|
|
|
quotecont = "cont;\
|
|
|
|
inued"
|
|
|
|
EOF
|
|
|
|
|
|
|
|
cat > expect <<\EOF
|
|
|
|
section.continued=continued
|
|
|
|
section.noncont=not continued
|
|
|
|
section.quotecont=cont;inued
|
|
|
|
EOF
|
|
|
|
|
2011-10-12 22:29:20 +04:00
|
|
|
test_expect_success 'value continued on next line' '
|
|
|
|
git config --list > result &&
|
2012-10-23 22:59:26 +04:00
|
|
|
test_cmp result expect
|
2011-10-12 22:29:20 +04:00
|
|
|
'
|
2007-01-23 15:37:25 +03:00
|
|
|
|
2007-06-25 18:03:55 +04:00
|
|
|
cat > .git/config <<\EOF
|
|
|
|
[section "sub=section"]
|
|
|
|
val1 = foo=bar
|
|
|
|
val2 = foo\nbar
|
|
|
|
val3 = \n\n
|
|
|
|
val4 =
|
|
|
|
val5
|
|
|
|
EOF
|
|
|
|
|
|
|
|
cat > expect <<\EOF
|
2007-06-27 16:40:41 +04:00
|
|
|
section.sub=section.val1
|
|
|
|
foo=barQsection.sub=section.val2
|
|
|
|
foo
|
|
|
|
barQsection.sub=section.val3
|
2007-06-25 18:03:55 +04:00
|
|
|
|
|
|
|
|
2007-06-27 16:40:41 +04:00
|
|
|
Qsection.sub=section.val4
|
|
|
|
Qsection.sub=section.val5Q
|
2007-06-25 18:03:55 +04:00
|
|
|
EOF
|
2011-10-12 22:29:20 +04:00
|
|
|
test_expect_success '--null --list' '
|
|
|
|
git config --null --list | nul_to_q >result &&
|
|
|
|
echo >>result &&
|
|
|
|
test_cmp expect result
|
|
|
|
'
|
2007-06-25 18:03:55 +04:00
|
|
|
|
2011-10-12 22:29:20 +04:00
|
|
|
test_expect_success '--null --get-regexp' '
|
|
|
|
git config --null --get-regexp "val[0-9]" | nul_to_q >result &&
|
|
|
|
echo >>result &&
|
|
|
|
test_cmp expect result
|
|
|
|
'
|
2007-06-25 18:03:55 +04:00
|
|
|
|
2009-07-30 15:41:57 +04:00
|
|
|
test_expect_success 'inner whitespace kept verbatim' '
|
|
|
|
git config section.val "foo bar" &&
|
2012-10-23 22:59:26 +04:00
|
|
|
echo "foo bar" >expect &&
|
|
|
|
git config section.val >actual &&
|
|
|
|
test_cmp expect actual
|
2009-07-30 15:41:57 +04:00
|
|
|
'
|
|
|
|
|
2009-03-05 00:38:24 +03:00
|
|
|
test_expect_success SYMLINKS 'symlinked configuration' '
|
2007-07-27 09:13:12 +04:00
|
|
|
ln -s notyet myconfig &&
|
|
|
|
GIT_CONFIG=myconfig git config test.frotz nitfol &&
|
|
|
|
test -h myconfig &&
|
|
|
|
test -f notyet &&
|
|
|
|
test "z$(GIT_CONFIG=notyet git config test.frotz)" = znitfol &&
|
|
|
|
GIT_CONFIG=myconfig git config test.xyzzy rezrov &&
|
|
|
|
test -h myconfig &&
|
|
|
|
test -f notyet &&
|
2012-10-23 22:59:26 +04:00
|
|
|
cat >expect <<-\EOF &&
|
|
|
|
nitfol
|
|
|
|
rezrov
|
|
|
|
EOF
|
|
|
|
{
|
|
|
|
GIT_CONFIG=notyet git config test.frotz &&
|
|
|
|
GIT_CONFIG=notyet git config test.xyzzy
|
|
|
|
} >actual &&
|
|
|
|
test_cmp expect actual
|
2007-07-27 09:13:12 +04:00
|
|
|
'
|
|
|
|
|
2010-10-21 18:45:44 +04:00
|
|
|
test_expect_success 'nonexistent configuration' '
|
|
|
|
(
|
|
|
|
GIT_CONFIG=doesnotexist &&
|
|
|
|
export GIT_CONFIG &&
|
|
|
|
test_must_fail git config --list &&
|
|
|
|
test_must_fail git config test.xyzzy
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success SYMLINKS 'symlink to nonexistent configuration' '
|
|
|
|
ln -s doesnotexist linktonada &&
|
|
|
|
ln -s linktonada linktolinktonada &&
|
|
|
|
(
|
|
|
|
GIT_CONFIG=linktonada &&
|
|
|
|
export GIT_CONFIG &&
|
|
|
|
test_must_fail git config --list &&
|
|
|
|
GIT_CONFIG=linktolinktonada &&
|
|
|
|
test_must_fail git config --list
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2008-09-22 19:06:41 +04:00
|
|
|
test_expect_success 'check split_cmdline return' "
|
|
|
|
git config alias.split-cmdline-fix 'echo \"' &&
|
|
|
|
test_must_fail git split-cmdline-fix &&
|
|
|
|
echo foo > foo &&
|
|
|
|
git add foo &&
|
|
|
|
git commit -m 'initial commit' &&
|
|
|
|
git config branch.master.mergeoptions 'echo \"' &&
|
|
|
|
test_must_fail git merge master
|
2012-10-23 22:59:26 +04:00
|
|
|
"
|
2008-09-22 19:06:41 +04:00
|
|
|
|
2010-03-27 01:53:57 +03:00
|
|
|
test_expect_success 'git -c "key=value" support' '
|
2012-10-23 22:59:26 +04:00
|
|
|
cat >expect <<-\EOF &&
|
|
|
|
value
|
|
|
|
value
|
|
|
|
true
|
|
|
|
EOF
|
|
|
|
{
|
|
|
|
git -c core.name=value config core.name &&
|
|
|
|
git -c foo.CamelCase=value config foo.camelcase &&
|
|
|
|
git -c foo.flag config --bool foo.flag
|
|
|
|
} >actual &&
|
|
|
|
test_cmp expect actual &&
|
2011-01-30 22:40:41 +03:00
|
|
|
test_must_fail git -c name=value config core.name
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'key sanity-checking' '
|
|
|
|
test_must_fail git config foo=bar &&
|
|
|
|
test_must_fail git config foo=.bar &&
|
|
|
|
test_must_fail git config foo.ba=r &&
|
|
|
|
test_must_fail git config foo.1bar &&
|
|
|
|
test_must_fail git config foo."ba
|
|
|
|
z".bar &&
|
2011-02-01 10:13:47 +03:00
|
|
|
test_must_fail git config . false &&
|
|
|
|
test_must_fail git config .foo false &&
|
|
|
|
test_must_fail git config foo. false &&
|
|
|
|
test_must_fail git config .foo. false &&
|
2011-01-30 22:40:41 +03:00
|
|
|
git config foo.bar true &&
|
|
|
|
git config foo."ba =z".bar false
|
2010-03-27 01:53:57 +03:00
|
|
|
'
|
|
|
|
|
2011-05-25 02:50:35 +04:00
|
|
|
test_expect_success 'git -c works with aliases of builtins' '
|
2011-05-25 02:49:55 +04:00
|
|
|
git config alias.checkconfig "-c foo.check=bar config foo.check" &&
|
|
|
|
echo bar >expect &&
|
|
|
|
git checkconfig >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
2011-06-09 19:51:36 +04:00
|
|
|
test_expect_success 'git -c does not split values on equals' '
|
|
|
|
echo "value with = in it" >expect &&
|
|
|
|
git -c core.foo="value with = in it" config core.foo >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
2011-06-09 19:52:32 +04:00
|
|
|
test_expect_success 'git -c dies on bogus config' '
|
|
|
|
test_must_fail git -c core.bare=foo rev-parse
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'git -c complains about empty key' '
|
|
|
|
test_must_fail git -c "=foo" rev-parse
|
|
|
|
'
|
|
|
|
|
2011-06-09 19:52:43 +04:00
|
|
|
test_expect_success 'git -c complains about empty key and value' '
|
|
|
|
test_must_fail git -c "" rev-parse
|
|
|
|
'
|
|
|
|
|
config: stop using config_exclusive_filename
The git-config command sometimes operates on the default set
of config files (either reading from all, or writing to repo
config), and sometimes operates on a specific file. In the
latter case, we set the magic global config_exclusive_filename,
and the code in config.c does the right thing.
Instead, let's have git-config use the "advanced" variants
of config.c's functions which let it specify an individual
filename (or NULL for the default). This makes the code a
lot more obvious, and fixes two small bugs:
1. A relative path specified by GIT_CONFIG=foo will look
in the wrong directory if we have to chdir as part of
repository setup. We already handle this properly for
"git config -f foo", but the GIT_CONFIG lookup used
config_exclusive_filename directly. By dropping to a
single magic variable, the GIT_CONFIG case now just
works.
2. Calling "git config -f foo --edit" would not respect
core.editor. This is because just before editing, we
called git_config, which would respect the
config_exclusive_filename setting, even though this
particular git_config call was not about looking in the
user's specified file, but rather about loading actual
git config, just as any other git program would.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-02-16 12:07:32 +04:00
|
|
|
test_expect_success 'git config --edit works' '
|
|
|
|
git config -f tmp test.value no &&
|
|
|
|
echo test.value=yes >expect &&
|
|
|
|
GIT_EDITOR="echo [test]value=yes >" git config -f tmp --edit &&
|
|
|
|
git config -f tmp --list >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'git config --edit respects core.editor' '
|
|
|
|
git config -f tmp test.value no &&
|
|
|
|
echo test.value=yes >expect &&
|
|
|
|
test_config core.editor "echo [test]value=yes >" &&
|
|
|
|
git config -f tmp --edit &&
|
|
|
|
git config -f tmp --list >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
2012-03-10 01:57:54 +04:00
|
|
|
# malformed configuration files
|
|
|
|
test_expect_success 'barf on syntax error' '
|
|
|
|
cat >.git/config <<-\EOF &&
|
|
|
|
# broken section line
|
|
|
|
[section]
|
|
|
|
key garbage
|
|
|
|
EOF
|
|
|
|
test_must_fail git config --get section.key >actual 2>error &&
|
|
|
|
grep " line 3 " error
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'barf on incomplete section header' '
|
|
|
|
cat >.git/config <<-\EOF &&
|
|
|
|
# broken section line
|
|
|
|
[section
|
|
|
|
key = value
|
|
|
|
EOF
|
|
|
|
test_must_fail git config --get section.key >actual 2>error &&
|
|
|
|
grep " line 2 " error
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'barf on incomplete string' '
|
|
|
|
cat >.git/config <<-\EOF &&
|
|
|
|
# broken section line
|
|
|
|
[section]
|
|
|
|
key = "value string
|
|
|
|
EOF
|
|
|
|
test_must_fail git config --get section.key >actual 2>error &&
|
|
|
|
grep " line 3 " error
|
|
|
|
'
|
|
|
|
|
t1300: document some aesthetic failures of the config editor
The config-editing code used by "git config var value" is
built around the regular config callback parser, whose only
triggerable item is an actual key. As a result, it does not
know anything about section headers, which can result in
unnecessarily ugly output:
1. When we delete the last key in a section, we should be
able to delete the section header.
2. When we add a key into a section, we should be able to
reuse the same section header, even if that section did
not have any keys in it already.
Unfortunately, fixing these is not trivial with the current
code. It would involve the config parser recording and
passing back information on each item it finds, including
headers, keys, and even comments (or even better, generating
an actual in-memory parse-tree).
Since these behaviors do not cause any functional problems
(i.e., the resulting config parses as expected, it is just
uglier than one would like), fixing them can wait until
somebody feels like substantially refactoring the parsing
code. In the meantime, let's document them as known issues
with some tests.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-03-29 23:51:55 +04:00
|
|
|
# good section hygiene
|
|
|
|
test_expect_failure 'unsetting the last key in a section removes header' '
|
|
|
|
cat >.git/config <<-\EOF &&
|
|
|
|
# some generic comment on the configuration file itself
|
|
|
|
# a comment specific to this "section" section.
|
|
|
|
[section]
|
|
|
|
# some intervening lines
|
|
|
|
# that should also be dropped
|
|
|
|
|
|
|
|
key = value
|
|
|
|
# please be careful when you update the above variable
|
|
|
|
EOF
|
|
|
|
|
|
|
|
cat >expect <<-\EOF &&
|
|
|
|
# some generic comment on the configuration file itself
|
|
|
|
EOF
|
|
|
|
|
|
|
|
git config --unset section.key &&
|
|
|
|
test_cmp expect .git/config
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_failure 'adding a key into an empty section reuses header' '
|
|
|
|
cat >.git/config <<-\EOF &&
|
|
|
|
[section]
|
|
|
|
EOF
|
|
|
|
|
|
|
|
q_to_tab >expect <<-\EOF &&
|
|
|
|
[section]
|
|
|
|
Qkey = value
|
|
|
|
EOF
|
|
|
|
|
|
|
|
git config section.key value
|
|
|
|
test_cmp expect .git/config
|
|
|
|
'
|
|
|
|
|
2005-11-18 00:50:08 +03:00
|
|
|
test_done
|