summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-09-19 11:38:40 -0700
committerJunio C Hamano <gitster@pobox.com>2014-09-19 11:38:40 -0700
commit4daf5c864348e8d2002b082d8ac484c650e395d4 (patch)
tree9d5d764dd36e3d502302bed2591b29dd3be440c4 /t
parent9d6db4a28ddbaf66bbc257251e97e9511a9148fd (diff)
parentc1063be2a3e14ac042db4fe9b9bcea8f2768886a (diff)
downloadgit-4daf5c864348e8d2002b082d8ac484c650e395d4.tar.gz
Merge branch 'ta/config-add-to-empty-or-true-fix'
"git config --add section.var val" used to lose existing section.var whose value was an empty string. * ta/config-add-to-empty-or-true-fix: config: avoid a funny sentinel value "a^" make config --add behave correctly for empty and NULL values
Diffstat (limited to 't')
-rwxr-xr-xt/t1303-wacky-config.sh20
1 files changed, 20 insertions, 0 deletions
diff --git a/t/t1303-wacky-config.sh b/t/t1303-wacky-config.sh
index 3a2c81968c..3b92083e19 100755
--- a/t/t1303-wacky-config.sh
+++ b/t/t1303-wacky-config.sh
@@ -111,4 +111,24 @@ test_expect_success 'unset many entries' '
test_must_fail git config section.key
'
+test_expect_success '--add appends new value after existing empty value' '
+ cat >expect <<-\EOF &&
+
+
+ fool
+ roll
+ EOF
+ cp .git/config .git/config.old &&
+ test_when_finished "mv .git/config.old .git/config" &&
+ cat >.git/config <<-\EOF &&
+ [foo]
+ baz
+ baz =
+ baz = fool
+ EOF
+ git config --add foo.baz roll &&
+ git config --get-all foo.baz >output &&
+ test_cmp expect output
+'
+
test_done