summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-05-15 20:48:22 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-05-15 20:48:22 (GMT)
commitd55aaefa3e3920bdf9a52d80da2a244f72742228 (patch)
treec265d4d469c854e633886dad092ede685e248a93 /t
parentde1d4fa2a1273e09c32653c7a21602e36223348c (diff)
parent1b9bc5a7b7434d771726011613a00cb202bd9f44 (diff)
downloadgit-d55aaefa3e3920bdf9a52d80da2a244f72742228.zip
git-d55aaefa3e3920bdf9a52d80da2a244f72742228.tar.gz
git-d55aaefa3e3920bdf9a52d80da2a244f72742228.tar.bz2
Merge branch 'fix'
* fix: Fix pack-index issue on 64-bit platforms a bit more portably. Install git-send-email by default Fix compilation on newer NetBSD systems git config syntax updates Another config file parsing fix. checkout: use --aggressive when running a 3-way merge (-m).
Diffstat (limited to 't')
-rwxr-xr-xt/t1300-repo-config.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/t/t1300-repo-config.sh b/t/t1300-repo-config.sh
index 7090ea9..8260d57 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' \