undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'tb/t0050-maint'

Browse Source 
Update tests that were expecting to fail due to a bug that was
fixed earlier.

* tb/t0050-maint:
  t0050: Use TAB for indentation
  t0050: honor CASE_INSENSITIVE_FS in add (with different case)
  t0050: known breakage vanished in merge (case change)
This commit is contained in:
Junio C Hamano 2013-01-28 10:59:28 -08:00
commit c96f4212cb
1 changed files with 17 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
t/t0050-filesystem.sh
View File

@ -29,12 +29,10 @@ test_have_prereq SYMLINKS ||
if test_have_prereq CASE_INSENSITIVE_FS if test_have_prereq CASE_INSENSITIVE_FS
then then
test_expect_success "detection of case insensitive filesystem during repo init" ' test_expect_success "detection of case insensitive filesystem during repo init" '
test $(git config --bool core.ignorecase) = true test $(git config --bool core.ignorecase) = true
' '
else else
test_expect_success "detection of case insensitive filesystem during repo init" ' test_expect_success "detection of case insensitive filesystem during repo init" '
test_must_fail git config --bool core.ignorecase >/dev/null || test_must_fail git config --bool core.ignorecase >/dev/null ||
test $(git config --bool core.ignorecase) = false test $(git config --bool core.ignorecase) = false
' '
@ -43,20 +41,17 @@ fi
if test_have_prereq SYMLINKS if test_have_prereq SYMLINKS
then then
test_expect_success "detection of filesystem w/o symlink support during repo init" ' test_expect_success "detection of filesystem w/o symlink support during repo init" '
test_must_fail git config --bool core.symlinks || test_must_fail git config --bool core.symlinks ||
test "$(git config --bool core.symlinks)" = true test "$(git config --bool core.symlinks)" = true
' '
else else
test_expect_success "detection of filesystem w/o symlink support during repo init" ' test_expect_success "detection of filesystem w/o symlink support during repo init" '
v=$(git config --bool core.symlinks) && v=$(git config --bool core.symlinks) &&
test "$v" = false test "$v" = false
' '
fi fi
test_expect_success "setup case tests" ' test_expect_success "setup case tests" '
git config core.ignorecase true && git config core.ignorecase true &&
touch camelcase && touch camelcase &&
git add camelcase && git add camelcase &&
@ -67,29 +62,23 @@ test_expect_success "setup case tests" '
git mv tmp CamelCase && git mv tmp CamelCase &&
git commit -m "rename" && git commit -m "rename" &&
git checkout -f master git checkout -f master
' '
$test_case 'rename (case change)' ' $test_case 'rename (case change)' '
git mv camelcase CamelCase && git mv camelcase CamelCase &&
git commit -m "rename" git commit -m "rename"
' '
$test_case 'merge (case change)' ' test_expect_success 'merge (case change)' '
rm -f CamelCase && rm -f CamelCase &&
rm -f camelcase && rm -f camelcase &&
git reset --hard initial && git reset --hard initial &&
git merge topic git merge topic
' '
test_expect_failure 'add (with different case)' ' test_expect_failure CASE_INSENSITIVE_FS 'add (with different case)' '
git reset --hard initial && git reset --hard initial &&
rm camelcase && rm camelcase &&
echo 1 >CamelCase && echo 1 >CamelCase &&
@ -97,37 +86,30 @@ test_expect_failure 'add (with different case)' '
camel=$(git ls-files | grep -i camelcase) && camel=$(git ls-files | grep -i camelcase) &&
test $(echo "$camel" | wc -l) = 1 && test $(echo "$camel" | wc -l) = 1 &&
test "z$(git cat-file blob :$camel)" = z1 test "z$(git cat-file blob :$camel)" = z1
' '
test_expect_success "setup unicode normalization tests" ' test_expect_success "setup unicode normalization tests" '
test_create_repo unicode &&
test_create_repo unicode && cd unicode &&
cd unicode && touch "$aumlcdiar" &&
touch "$aumlcdiar" && git add "$aumlcdiar" &&
git add "$aumlcdiar" && git commit -m initial &&
git commit -m initial && git tag initial &&
git tag initial && git checkout -b topic &&
git checkout -b topic && git mv $aumlcdiar tmp &&
git mv $aumlcdiar tmp && git mv tmp "$auml" &&
git mv tmp "$auml" && git commit -m rename &&
git commit -m rename && git checkout -f master
git checkout -f master
' '
$test_unicode 'rename (silent unicode normalization)' ' $test_unicode 'rename (silent unicode normalization)' '
git mv "$aumlcdiar" "$auml" &&
git mv "$aumlcdiar" "$auml" && git commit -m rename
git commit -m rename
' '
$test_unicode 'merge (silent unicode normalization)' ' $test_unicode 'merge (silent unicode normalization)' '
git reset --hard initial &&
git reset --hard initial && git merge topic
git merge topic
' '
test_done test_done