t/t1300-repo-config.sh

   1 #!/bin/sh
   2 #
   3 # Copyright (c) 2005 Johannes Schindelin
   4 #
   5
   6 test_description='Test git config in different settings'
   7
   8 . ./test-lib.sh
   9
  10 test -f .git/config && rm .git/config
  11
  12 git config core.penguin "little blue"
  13
  14 cat > expect << EOF
  15 [core]
  16         penguin = little blue
  17 EOF
  18
  19 test_expect_success 'initial' 'cmp .git/config expect'
  20
  21 git config Core.Movie BadPhysics
  22
  23 cat > expect << EOF
  24 [core]
  25         penguin = little blue
  26         Movie = BadPhysics
  27 EOF
  28
  29 test_expect_success 'mixed case' 'cmp .git/config expect'
  30
  31 git config Cores.WhatEver Second
  32
  33 cat > expect << EOF
  34 [core]
  35         penguin = little blue
  36         Movie = BadPhysics
  37 [Cores]
  38         WhatEver = Second
  39 EOF
  40
  41 test_expect_success 'similar section' 'cmp .git/config expect'
  42
  43 git config CORE.UPPERCASE true
  44
  45 cat > expect << EOF
  46 [core]
  47         penguin = little blue
  48         Movie = BadPhysics
  49         UPPERCASE = true
  50 [Cores]
  51         WhatEver = Second
  52 EOF
  53
  54 test_expect_success 'similar section' 'cmp .git/config expect'
  55
  56 test_expect_success 'replace with non-match' \
  57         'git config core.penguin kingpin !blue'
  58
  59 test_expect_success 'replace with non-match (actually matching)' \
  60         'git config core.penguin "very blue" !kingpin'
  61
  62 cat > expect << EOF
  63 [core]
  64         penguin = very blue
  65         Movie = BadPhysics
  66         UPPERCASE = true
  67         penguin = kingpin
  68 [Cores]
  69         WhatEver = Second
  70 EOF
  71
  72 test_expect_success 'non-match result' 'cmp .git/config expect'
  73
  74 cat > .git/config <<\EOF
  75 [alpha]
  76 bar = foo
  77 [beta]
  78 baz = multiple \
  79 lines
  80 EOF
  81
  82 test_expect_success 'unset with cont. lines' \
  83         'git config --unset beta.baz'
  84
  85 cat > expect <<\EOF
  86 [alpha]
  87 bar = foo
  88 [beta]
  89 EOF
  90
  91 test_expect_success 'unset with cont. lines is correct' 'cmp .git/config expect'
  92
  93 cat > .git/config << EOF
  94 [beta] ; silly comment # another comment
  95 noIndent= sillyValue ; 'nother silly comment
  96
  97 # empty line
  98                 ; comment
  99                 haha   ="beta" # last silly comment
 100 haha = hello
 101         haha = bello
 102 [nextSection] noNewline = ouch
 103 EOF
 104
 105 cp .git/config .git/config2
 106
 107 test_expect_success 'multiple unset' \
 108         'git config --unset-all beta.haha'
 109
 110 cat > expect << EOF
 111 [beta] ; silly comment # another comment
 112 noIndent= sillyValue ; 'nother silly comment
 113
 114 # empty line
 115                 ; comment
 116 [nextSection] noNewline = ouch
 117 EOF
 118
 119 test_expect_success 'multiple unset is correct' 'cmp .git/config expect'
 120
 121 cp .git/config2 .git/config
 122
 123 test_expect_success '--replace-all missing value' '
 124         test_must_fail git config --replace-all beta.haha &&
 125         test_cmp .git/config2 .git/config
 126 '
 127
 128 rm .git/config2
 129
 130 test_expect_success '--replace-all' \
 131         'git config --replace-all beta.haha gamma'
 132
 133 cat > expect << EOF
 134 [beta] ; silly comment # another comment
 135 noIndent= sillyValue ; 'nother silly comment
 136
 137 # empty line
 138                 ; comment
 139         haha = gamma
 140 [nextSection] noNewline = ouch
 141 EOF
 142
 143 test_expect_success 'all replaced' 'cmp .git/config expect'
 144
 145 git config beta.haha alpha
 146
 147 cat > expect << EOF
 148 [beta] ; silly comment # another comment
 149 noIndent= sillyValue ; 'nother silly comment
 150
 151 # empty line
 152                 ; comment
 153         haha = alpha
 154 [nextSection] noNewline = ouch
 155 EOF
 156
 157 test_expect_success 'really mean test' 'cmp .git/config expect'
 158
 159 git config nextsection.nonewline wow
 160
 161 cat > expect << EOF
 162 [beta] ; silly comment # another comment
 163 noIndent= sillyValue ; 'nother silly comment
 164
 165 # empty line
 166                 ; comment
 167         haha = alpha
 168 [nextSection]
 169         nonewline = wow
 170 EOF
 171
 172 test_expect_success 'really really mean test' 'cmp .git/config expect'
 173
 174 test_expect_success 'get value' 'test alpha = $(git config beta.haha)'
 175 git config --unset beta.haha
 176
 177 cat > expect << EOF
 178 [beta] ; silly comment # another comment
 179 noIndent= sillyValue ; 'nother silly comment
 180
 181 # empty line
 182                 ; comment
 183 [nextSection]
 184         nonewline = wow
 185 EOF
 186
 187 test_expect_success 'unset' 'cmp .git/config expect'
 188
 189 git config nextsection.NoNewLine "wow2 for me" "for me$"
 190
 191 cat > expect << EOF
 192 [beta] ; silly comment # another comment
 193 noIndent= sillyValue ; 'nother silly comment
 194
 195 # empty line
 196                 ; comment
 197 [nextSection]
 198         nonewline = wow
 199         NoNewLine = wow2 for me
 200 EOF
 201
 202 test_expect_success 'multivar' 'cmp .git/config expect'
 203
 204 test_expect_success 'non-match' \
 205         'git config --get nextsection.nonewline !for'
 206
 207 test_expect_success 'non-match value' \
 208         'test wow = $(git config --get nextsection.nonewline !for)'
 209
 210 test_expect_success 'ambiguous get' '
 211         test_must_fail git config --get nextsection.nonewline
 212 '
 213
 214 test_expect_success 'get multivar' \
 215         'git config --get-all nextsection.nonewline'
 216
 217 git config nextsection.nonewline "wow3" "wow$"
 218
 219 cat > expect << EOF
 220 [beta] ; silly comment # another comment
 221 noIndent= sillyValue ; 'nother silly comment
 222
 223 # empty line
 224                 ; comment
 225 [nextSection]
 226         nonewline = wow3
 227         NoNewLine = wow2 for me
 228 EOF
 229
 230 test_expect_success 'multivar replace' 'cmp .git/config expect'
 231
 232 test_expect_success 'ambiguous value' '
 233         test_must_fail git config nextsection.nonewline
 234 '
 235
 236 test_expect_success 'ambiguous unset' '
 237         test_must_fail git config --unset nextsection.nonewline
 238 '
 239
 240 test_expect_success 'invalid unset' '
 241         test_must_fail git config --unset somesection.nonewline
 242 '
 243
 244 git config --unset nextsection.nonewline "wow3$"
 245
 246 cat > expect << EOF
 247 [beta] ; silly comment # another comment
 248 noIndent= sillyValue ; 'nother silly comment
 249
 250 # empty line
 251                 ; comment
 252 [nextSection]
 253         NoNewLine = wow2 for me
 254 EOF
 255
 256 test_expect_success 'multivar unset' 'cmp .git/config expect'
 257
 258 test_expect_success 'invalid key' 'test_must_fail git config inval.2key blabla'
 259
 260 test_expect_success 'correct key' 'git config 123456.a123 987'
 261
 262 test_expect_success 'hierarchical section' \
 263         'git config Version.1.2.3eX.Alpha beta'
 264
 265 cat > expect << EOF
 266 [beta] ; silly comment # another comment
 267 noIndent= sillyValue ; 'nother silly comment
 268
 269 # empty line
 270                 ; comment
 271 [nextSection]
 272         NoNewLine = wow2 for me
 273 [123456]
 274         a123 = 987
 275 [Version "1.2.3eX"]
 276         Alpha = beta
 277 EOF
 278
 279 test_expect_success 'hierarchical section value' 'cmp .git/config expect'
 280
 281 cat > expect << EOF
 282 beta.noindent=sillyValue
 283 nextsection.nonewline=wow2 for me
 284 123456.a123=987
 285 version.1.2.3eX.alpha=beta
 286 EOF
 287
 288 test_expect_success 'working --list' \
 289         'git config --list > output && cmp output expect'
 290
 291 cat > expect << EOF
 292 beta.noindent sillyValue
 293 nextsection.nonewline wow2 for me
 294 EOF
 295
 296 test_expect_success '--get-regexp' \
 297         'git config --get-regexp in > output && cmp output expect'
 298
 299 git config --add nextsection.nonewline "wow4 for you"
 300
 301 cat > expect << EOF
 302 wow2 for me
 303 wow4 for you
 304 EOF
 305
 306 test_expect_success '--add' \
 307         'git config --get-all nextsection.nonewline > output && cmp output expect'
 308
 309 cat > .git/config << EOF
 310 [novalue]
 311         variable
 312 [emptyvalue]
 313         variable =
 314 EOF
 315
 316 test_expect_success 'get variable with no value' \
 317         'git config --get novalue.variable ^$'
 318
 319 test_expect_success 'get variable with empty value' \
 320         'git config --get emptyvalue.variable ^$'
 321
 322 echo novalue.variable > expect
 323
 324 test_expect_success 'get-regexp variable with no value' \
 325         'git config --get-regexp novalue > output &&
 326          cmp output expect'
 327
 328 echo 'emptyvalue.variable ' > expect
 329
 330 test_expect_success 'get-regexp variable with empty value' \
 331         'git config --get-regexp emptyvalue > output &&
 332          cmp output expect'
 333
 334 echo true > expect
 335
 336 test_expect_success 'get bool variable with no value' \
 337         'git config --bool novalue.variable > output &&
 338          cmp output expect'
 339
 340 echo false > expect
 341
 342 test_expect_success 'get bool variable with empty value' \
 343         'git config --bool emptyvalue.variable > output &&
 344          cmp output expect'
 345
 346 test_expect_success 'no arguments, but no crash' '
 347         test_must_fail git config >output 2>&1 &&
 348         grep usage output
 349 '
 350
 351 cat > .git/config << EOF
 352 [a.b]
 353         c = d
 354 EOF
 355
 356 git config a.x y
 357
 358 cat > expect << EOF
 359 [a.b]
 360         c = d
 361 [a]
 362         x = y
 363 EOF
 364
 365 test_expect_success 'new section is partial match of another' 'cmp .git/config expect'
 366
 367 git config b.x y
 368 git config a.b c
 369
 370 cat > expect << EOF
 371 [a.b]
 372         c = d
 373 [a]
 374         x = y
 375         b = c
 376 [b]
 377         x = y
 378 EOF
 379
 380 test_expect_success 'new variable inserts into proper section' 'cmp .git/config expect'
 381
 382 test_expect_success 'alternative GIT_CONFIG (non-existing file should fail)' \
 383         'test_must_fail git config --file non-existing-config -l'
 384
 385 cat > other-config << EOF
 386 [ein]
 387         bahn = strasse
 388 EOF
 389
 390 cat > expect << EOF
 391 ein.bahn=strasse
 392 EOF
 393
 394 GIT_CONFIG=other-config git config -l > output
 395
 396 test_expect_success 'alternative GIT_CONFIG' 'cmp output expect'
 397
 398 test_expect_success 'alternative GIT_CONFIG (--file)' \
 399         'git config --file other-config -l > output && cmp output expect'
 400
 401 test_expect_success 'refer config from subdirectory' '
 402         mkdir x &&
 403         (
 404                 cd x &&
 405                 echo strasse >expect
 406                 git config --get --file ../other-config ein.bahn >actual &&
 407                 test_cmp expect actual
 408         )
 409
 410 '
 411
 412 GIT_CONFIG=other-config git config anwohner.park ausweis
 413
 414 cat > expect << EOF
 415 [ein]
 416         bahn = strasse
 417 [anwohner]
 418         park = ausweis
 419 EOF
 420
 421 test_expect_success '--set in alternative GIT_CONFIG' 'cmp other-config expect'
 422
 423 cat > .git/config << EOF
 424 # Hallo
 425         #Bello
 426 [branch "eins"]
 427         x = 1
 428 [branch.eins]
 429         y = 1
 430         [branch "1 234 blabl/a"]
 431 weird
 432 EOF
 433
 434 test_expect_success "rename section" \
 435         "git config --rename-section branch.eins branch.zwei"
 436
 437 cat > expect << EOF
 438 # Hallo
 439         #Bello
 440 [branch "zwei"]
 441         x = 1
 442 [branch "zwei"]
 443         y = 1
 444         [branch "1 234 blabl/a"]
 445 weird
 446 EOF
 447
 448 test_expect_success "rename succeeded" "test_cmp expect .git/config"
 449
 450 test_expect_success "rename non-existing section" '
 451         test_must_fail git config --rename-section \
 452                 branch."world domination" branch.drei
 453 '
 454
 455 test_expect_success "rename succeeded" "test_cmp expect .git/config"
 456
 457 test_expect_success "rename another section" \
 458         'git config --rename-section branch."1 234 blabl/a" branch.drei'
 459
 460 cat > expect << EOF
 461 # Hallo
 462         #Bello
 463 [branch "zwei"]
 464         x = 1
 465 [branch "zwei"]
 466         y = 1
 467 [branch "drei"]
 468 weird
 469 EOF
 470
 471 test_expect_success "rename succeeded" "test_cmp expect .git/config"
 472
 473 cat >> .git/config << EOF
 474 [branch "vier"] z = 1
 475 EOF
 476
 477 test_expect_success "rename a section with a var on the same line" \
 478         'git config --rename-section branch.vier branch.zwei'
 479
 480 cat > expect << EOF
 481 # Hallo
 482         #Bello
 483 [branch "zwei"]
 484         x = 1
 485 [branch "zwei"]
 486         y = 1
 487 [branch "drei"]
 488 weird
 489 [branch "zwei"]
 490         z = 1
 491 EOF
 492
 493 test_expect_success "rename succeeded" "test_cmp expect .git/config"
 494
 495 cat >> .git/config << EOF
 496   [branch "zwei"] a = 1 [branch "vier"]
 497 EOF
 498
 499 test_expect_success "remove section" "git config --remove-section branch.zwei"
 500
 501 cat > expect << EOF
 502 # Hallo
 503         #Bello
 504 [branch "drei"]
 505 weird
 506 EOF
 507
 508 test_expect_success "section was removed properly" \
 509         "test_cmp expect .git/config"
 510
 511 rm .git/config
 512
 513 cat > expect << EOF
 514 [gitcvs]
 515         enabled = true
 516         dbname = %Ggitcvs2.%a.%m.sqlite
 517 [gitcvs "ext"]
 518         dbname = %Ggitcvs1.%a.%m.sqlite
 519 EOF
 520
 521 test_expect_success 'section ending' '
 522
 523         git config gitcvs.enabled true &&
 524         git config gitcvs.ext.dbname %Ggitcvs1.%a.%m.sqlite &&
 525         git config gitcvs.dbname %Ggitcvs2.%a.%m.sqlite &&
 526         cmp .git/config expect
 527
 528 '
 529
 530 test_expect_success numbers '
 531
 532         git config kilo.gram 1k &&
 533         git config mega.ton 1m &&
 534         k=$(git config --int --get kilo.gram) &&
 535         test z1024 = "z$k" &&
 536         m=$(git config --int --get mega.ton) &&
 537         test z1048576 = "z$m"
 538 '
 539
 540 cat > expect <<EOF
 541 fatal: bad config value for 'aninvalid.unit' in .git/config
 542 EOF
 543
 544 test_expect_success 'invalid unit' '
 545
 546         git config aninvalid.unit "1auto" &&
 547         s=$(git config aninvalid.unit) &&
 548         test "z1auto" = "z$s" &&
 549         if git config --int --get aninvalid.unit 2>actual
 550         then
 551                 echo config should have failed
 552                 false
 553         fi &&
 554         cmp actual expect
 555 '
 556
 557 cat > expect << EOF
 558 true
 559 false
 560 true
 561 false
 562 true
 563 false
 564 true
 565 false
 566 EOF
 567
 568 test_expect_success bool '
 569
 570         git config bool.true1 01 &&
 571         git config bool.true2 -1 &&
 572         git config bool.true3 YeS &&
 573         git config bool.true4 true &&
 574         git config bool.false1 000 &&
 575         git config bool.false2 "" &&
 576         git config bool.false3 nO &&
 577         git config bool.false4 FALSE &&
 578         rm -f result &&
 579         for i in 1 2 3 4
 580         do
 581             git config --bool --get bool.true$i >>result
 582             git config --bool --get bool.false$i >>result
 583         done &&
 584         cmp expect result'
 585
 586 test_expect_success 'invalid bool (--get)' '
 587
 588         git config bool.nobool foobar &&
 589         test_must_fail git config --bool --get bool.nobool'
 590
 591 test_expect_success 'invalid bool (set)' '
 592
 593         test_must_fail git config --bool bool.nobool foobar'
 594
 595 rm .git/config
 596
 597 cat > expect <<\EOF
 598 [bool]
 599         true1 = true
 600         true2 = true
 601         true3 = true
 602         true4 = true
 603         false1 = false
 604         false2 = false
 605         false3 = false
 606         false4 = false
 607 EOF
 608
 609 test_expect_success 'set --bool' '
 610
 611         git config --bool bool.true1 01 &&
 612         git config --bool bool.true2 -1 &&
 613         git config --bool bool.true3 YeS &&
 614         git config --bool bool.true4 true &&
 615         git config --bool bool.false1 000 &&
 616         git config --bool bool.false2 "" &&
 617         git config --bool bool.false3 nO &&
 618         git config --bool bool.false4 FALSE &&
 619         cmp expect .git/config'
 620
 621 rm .git/config
 622
 623 cat > expect <<\EOF
 624 [int]
 625         val1 = 1
 626         val2 = -1
 627         val3 = 5242880
 628 EOF
 629
 630 test_expect_success 'set --int' '
 631
 632         git config --int int.val1 01 &&
 633         git config --int int.val2 -1 &&
 634         git config --int int.val3 5m &&
 635         cmp expect .git/config'
 636
 637 rm .git/config
 638
 639 cat >expect <<\EOF
 640 [bool]
 641         true1 = true
 642         true2 = true
 643         false1 = false
 644         false2 = false
 645 [int]
 646         int1 = 0
 647         int2 = 1
 648         int3 = -1
 649 EOF
 650
 651 test_expect_success 'get --bool-or-int' '
 652         (
 653                 echo "[bool]"
 654                 echo true1
 655                 echo true2 = true
 656                 echo false = false
 657                 echo "[int]"
 658                 echo int1 = 0
 659                 echo int2 = 1
 660                 echo int3 = -1
 661         ) >>.git/config &&
 662         test $(git config --bool-or-int bool.true1) = true &&
 663         test $(git config --bool-or-int bool.true2) = true &&
 664         test $(git config --bool-or-int bool.false) = false &&
 665         test $(git config --bool-or-int int.int1) = 0 &&
 666         test $(git config --bool-or-int int.int2) = 1 &&
 667         test $(git config --bool-or-int int.int3) = -1
 668
 669 '
 670
 671 rm .git/config
 672 cat >expect <<\EOF
 673 [bool]
 674         true1 = true
 675         false1 = false
 676         true2 = true
 677         false2 = false
 678 [int]
 679         int1 = 0
 680         int2 = 1
 681         int3 = -1
 682 EOF
 683
 684 test_expect_success 'set --bool-or-int' '
 685         git config --bool-or-int bool.true1 true &&
 686         git config --bool-or-int bool.false1 false &&
 687         git config --bool-or-int bool.true2 yes &&
 688         git config --bool-or-int bool.false2 no &&
 689         git config --bool-or-int int.int1 0 &&
 690         git config --bool-or-int int.int2 1 &&
 691         git config --bool-or-int int.int3 -1 &&
 692         test_cmp expect .git/config
 693 '
 694
 695 rm .git/config
 696
 697 cat >expect <<\EOF
 698 [path]
 699         home = ~/
 700         normal = /dev/null
 701         trailingtilde = foo~
 702 EOF
 703
 704 test_expect_success NOT_MINGW 'set --path' '
 705         git config --path path.home "~/" &&
 706         git config --path path.normal "/dev/null" &&
 707         git config --path path.trailingtilde "foo~" &&
 708         test_cmp expect .git/config'
 709
 710 if test_have_prereq NOT_MINGW && test "${HOME+set}"
 711 then
 712         test_set_prereq HOMEVAR
 713 fi
 714
 715 cat >expect <<EOF
 716 $HOME/
 717 /dev/null
 718 foo~
 719 EOF
 720
 721 test_expect_success HOMEVAR 'get --path' '
 722         git config --get --path path.home > result &&
 723         git config --get --path path.normal >> result &&
 724         git config --get --path path.trailingtilde >> result &&
 725         test_cmp expect result
 726 '
 727
 728 cat >expect <<\EOF
 729 /dev/null
 730 foo~
 731 EOF
 732
 733 test_expect_success NOT_MINGW 'get --path copes with unset $HOME' '
 734         (
 735                 unset HOME;
 736                 test_must_fail git config --get --path path.home \
 737                         >result 2>msg &&
 738                 git config --get --path path.normal >>result &&
 739                 git config --get --path path.trailingtilde >>result
 740         ) &&
 741         grep "[Ff]ailed to expand.*~/" msg &&
 742         test_cmp expect result
 743 '
 744
 745 rm .git/config
 746
 747 git config quote.leading " test"
 748 git config quote.ending "test "
 749 git config quote.semicolon "test;test"
 750 git config quote.hash "test#test"
 751
 752 cat > expect << EOF
 753 [quote]
 754         leading = " test"
 755         ending = "test "
 756         semicolon = "test;test"
 757         hash = "test#test"
 758 EOF
 759
 760 test_expect_success 'quoting' 'cmp .git/config expect'
 761
 762 test_expect_success 'key with newline' '
 763         test_must_fail git config "key.with
 764 newline" 123'
 765
 766 test_expect_success 'value with newline' 'git config key.sub value.with\\\
 767 newline'
 768
 769 cat > .git/config <<\EOF
 770 [section]
 771         ; comment \
 772         continued = cont\
 773 inued
 774         noncont   = not continued ; \
 775         quotecont = "cont;\
 776 inued"
 777 EOF
 778
 779 cat > expect <<\EOF
 780 section.continued=continued
 781 section.noncont=not continued
 782 section.quotecont=cont;inued
 783 EOF
 784
 785 git config --list > result
 786
 787 test_expect_success 'value continued on next line' 'cmp result expect'
 788
 789 cat > .git/config <<\EOF
 790 [section "sub=section"]
 791         val1 = foo=bar
 792         val2 = foo\nbar
 793         val3 = \n\n
 794         val4 =
 795         val5
 796 EOF
 797
 798 cat > expect <<\EOF
 799 section.sub=section.val1
 800 foo=barQsection.sub=section.val2
 801 foo
 802 barQsection.sub=section.val3
 803
 804
 805 Qsection.sub=section.val4
 806 Qsection.sub=section.val5Q
 807 EOF
 808
 809 git config --null --list | perl -pe 'y/\000/Q/' > result
 810 echo >>result
 811
 812 test_expect_success '--null --list' 'cmp result expect'
 813
 814 git config --null --get-regexp 'val[0-9]' | perl -pe 'y/\000/Q/' > result
 815 echo >>result
 816
 817 test_expect_success '--null --get-regexp' 'cmp result expect'
 818
 819 test_expect_success 'inner whitespace kept verbatim' '
 820         git config section.val "foo       bar" &&
 821         test "z$(git config section.val)" = "zfoo         bar"
 822 '
 823
 824 test_expect_success SYMLINKS 'symlinked configuration' '
 825
 826         ln -s notyet myconfig &&
 827         GIT_CONFIG=myconfig git config test.frotz nitfol &&
 828         test -h myconfig &&
 829         test -f notyet &&
 830         test "z$(GIT_CONFIG=notyet git config test.frotz)" = znitfol &&
 831         GIT_CONFIG=myconfig git config test.xyzzy rezrov &&
 832         test -h myconfig &&
 833         test -f notyet &&
 834         test "z$(GIT_CONFIG=notyet git config test.frotz)" = znitfol &&
 835         test "z$(GIT_CONFIG=notyet git config test.xyzzy)" = zrezrov
 836
 837 '
 838
 839 test_expect_success 'check split_cmdline return' "
 840         git config alias.split-cmdline-fix 'echo \"' &&
 841         test_must_fail git split-cmdline-fix &&
 842         echo foo > foo &&
 843         git add foo &&
 844         git commit -m 'initial commit' &&
 845         git config branch.master.mergeoptions 'echo \"' &&
 846         test_must_fail git merge master
 847         "
 848
 849 test_expect_success 'git -c "key=value" support' '
 850         test "z$(git -c name=value config name)" = zvalue &&
 851         test "z$(git -c core.name=value config core.name)" = zvalue &&
 852         test "z$(git -c CamelCase=value config camelcase)" = zvalue &&
 853         test "z$(git -c flag config --bool flag)" = ztrue &&
 854         test_must_fail git -c core.name=value config name
 855 '
 856
 857 test_done