mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'lt/config' into next

Browse Source 
* lt/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
  fix diff-delta bad memory access
This commit is contained in:
Junio C Hamano
2006-05-13 18:49:54 -07:00
parent 7278a29a27 8d48ad62a9
commit ea892b27b1
6 changed files with 93 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
t/t1300-repo-config.sh
View File

@ -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' \