diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-05-06 21:47:22 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-06 21:47:22 -0700 |
| commit | c2b9e6994d044b218e59abf6d19f7751c4aa13e3 (patch) | |
| tree | 191050855782f098c4ef4a24bcb673cda33f1902 /t | |
| parent | Merge branch 'jc/reupdate' into next (diff) | |
| parent | fmt-patch: understand old <his> notation (diff) | |
| download | tgif-c2b9e6994d044b218e59abf6d19f7751c4aa13e3.tar.xz | |
Merge branch 'js/fmt-patch' into next
* js/fmt-patch:
fmt-patch: understand old <his> notation
t1300-repo-config: two new config parsing tests.
Another config file parsing fix.
Diffstat (limited to 't')
| -rwxr-xr-x | t/t1300-repo-config.sh | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/t/t1300-repo-config.sh b/t/t1300-repo-config.sh index 1bf728fb06..7090ea92c1 100755 --- a/t/t1300-repo-config.sh +++ b/t/t1300-repo-config.sh @@ -278,5 +278,36 @@ git-repo-config > output 2>&1 test_expect_success 'no arguments, but no crash' \ "test $? = 129 && grep usage output" +cat > .git/config << EOF +[a.b] + c = d +EOF + +git-repo-config a.x y + +cat > expect << EOF +[a.b] + c = d +[a] + x = y +EOF + +test_expect_success 'new section is partial match of another' 'cmp .git/config expect' + +git-repo-config b.x y +git-repo-config a.b c + +cat > expect << EOF +[a.b] + c = d +[a] + x = y + b = c +[b] + x = y +EOF + +test_expect_success 'new variable inserts into proper section' 'cmp .git/config expect' + test_done |