diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-05-13 14:10:48 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-13 14:11:43 -0700 |
| commit | 8d48ad62a902556b523ee892a3fbe4206d576d3f (patch) | |
| tree | 7ac4f3014ebba31845797f62fc39dac5cd246dd1 /t | |
| parent | fix diff-delta bad memory access (diff) | |
| parent | git config syntax updates (diff) | |
| download | tgif-8d48ad62a902556b523ee892a3fbe4206d576d3f.tar.xz | |
Merge branch 'lt/fix-config' into lt/config
* lt/fix-config:
git config syntax updates
Another config file parsing fix.
checkout: use --aggressive when running a 3-way merge (-m).
Fix git-pack-objects for 64-bit platforms
with manual adjustment of t/t1300 for "git repo-config --list" option.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t1300-repo-config.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/t/t1300-repo-config.sh b/t/t1300-repo-config.sh index 7090ea92c1..8260d57b63 100755 --- a/t/t1300-repo-config.sh +++ b/t/t1300-repo-config.sh @@ -229,7 +229,7 @@ test_expect_failure 'invalid key' 'git-repo-config inval.2key blabla' test_expect_success 'correct key' 'git-repo-config 123456.a123 987' test_expect_success 'hierarchical section' \ - 'git-repo-config 1.2.3.alpha beta' + 'git-repo-config Version.1.2.3eX.Alpha beta' cat > expect << EOF [beta] ; silly comment # another comment @@ -241,8 +241,8 @@ noIndent= sillyValue ; 'nother silly comment NoNewLine = wow2 for me [123456] a123 = 987 -[1.2.3] - alpha = beta +[Version "1.2.3eX"] + Alpha = beta EOF test_expect_success 'hierarchical section value' 'cmp .git/config expect' @@ -251,7 +251,7 @@ cat > expect << EOF beta.noindent=sillyValue nextsection.nonewline=wow2 for me 123456.a123=987 -1.2.3.alpha=beta +version.1.2.3eX.alpha=beta EOF test_expect_success 'working --list' \ |