checkout -m --conflict=diff3: add a label for ancestor

diff --git a/t/t0050-filesystem.sh b/t/t0050-filesystem.sh
index 7edf49db3c37982a6d599a39b98ce60ceeb0039b..41df6bcf279a1abc4462e63866076094cfbdedd8 100755 (executable)
--- a/t/t0050-filesystem.sh
+++ b/t/t0050-filesystem.sh
@@ -8,7 +8,9 @@ auml=`printf '\xc3\xa4'`
 aumlcdiar=`printf '\x61\xcc\x88'`
 
 case_insensitive=
-test_expect_success 'see if we expect ' '
+unibad=
+no_symlinks=
+test_expect_success 'see what we expect' '
 
        test_case=test_expect_success
        test_unicode=test_expect_success
@@ -19,7 +21,6 @@ test_expect_success 'see if we expect ' '
        then
                test_case=test_expect_failure
                case_insensitive=t
-               say "will test on a case insensitive filesystem"
        fi &&
        rm -fr junk &&
        mkdir junk &&
@@ -27,13 +28,26 @@ test_expect_success 'see if we expect ' '
        case "$(cd junk && echo *)" in
        "$aumlcdiar")
                test_unicode=test_expect_failure
-               say "will test on a unicode corrupting filesystem"
+               unibad=t
                ;;
        *)      ;;
        esac &&
-       rm -fr junk
+       rm -fr junk &&
+       {
+               ln -s x y 2> /dev/null &&
+               test -h y 2> /dev/null ||
+               no_symlinks=1
+               rm -f y
+       }
 '
 
+test "$case_insensitive" &&
+       say "will test on a case insensitive filesystem"
+test "$unibad" &&
+       say "will test on a unicode corrupting filesystem"
+test "$no_symlinks" &&
+       say "will test on a filesystem lacking symbolic links"
+
 if test "$case_insensitive"
 then
 test_expect_success "detection of case insensitive filesystem during repo init" '
@@ -48,6 +62,21 @@ test_expect_success "detection of case insensitive filesystem during repo init"
 '
 fi
 
+if test "$no_symlinks"
+then
+test_expect_success "detection of filesystem w/o symlink support during repo init" '
+
+       v=$(git config --bool core.symlinks) &&
+       test "$v" = false
+'
+else
+test_expect_success "detection of filesystem w/o symlink support during repo init" '
+
+       test_must_fail git config --bool core.symlinks ||
+       test "$(git config --bool core.symlinks)" = true
+'
+fi
+
 test_expect_success "setup case tests" '
 
        git config core.ignorecase true &&
@@ -79,13 +108,17 @@ $test_case 'merge (case change)' '
 
 '
 
-$test_case 'add (with different case)' '
+
+
+test_expect_failure 'add (with different case)' '
 
        git reset --hard initial &&
        rm camelcase &&
        echo 1 >CamelCase &&
        git add CamelCase &&
-       test $(git ls-files | grep -i camelcase | wc -l) = 1
+       camel=$(git ls-files | grep -i camelcase) &&
+       test $(echo "$camel" | wc -l) = 1 &&
+       test "z$(git cat-file blob :$camel)" = z1
 
 '