mirror of
https://github.com/git/git.git
synced 2026-04-01 20:40:08 +02:00
Undo MinGW specific test suite changes that are no longer needed
The test failures are fixed meanwhile for various reasons: - Path mangling happens less often due to an updated MSYS-1.0.DLL. - pwd now always reports a Windows-style path (this was introduced in4114156a). - The whitespace breakage in t1003 has mysteriously disappeared (perhaps due to a tool upgrade?) - The work-around in t4116 was fixed in36adb4ab. Signed-off-by: Johannes Sixt <j6t@kdbg.org>
This commit is contained in:
@@ -108,7 +108,7 @@ test_expect_success 'GIT_DIR & GIT_WORK_TREE (1)' '
|
|||||||
mkdir git-dir-wt-1.git &&
|
mkdir git-dir-wt-1.git &&
|
||||||
GIT_WORK_TREE=$(pwd) GIT_DIR=git-dir-wt-1.git git init
|
GIT_WORK_TREE=$(pwd) GIT_DIR=git-dir-wt-1.git git init
|
||||||
) &&
|
) &&
|
||||||
check_config git-dir-wt-1.git false "$(pwd -W)"
|
check_config git-dir-wt-1.git false "$(pwd)"
|
||||||
'
|
'
|
||||||
|
|
||||||
test_expect_success 'GIT_DIR & GIT_WORK_TREE (2)' '
|
test_expect_success 'GIT_DIR & GIT_WORK_TREE (2)' '
|
||||||
|
|||||||
@@ -8,10 +8,6 @@ test_description='git read-tree --prefix test.
|
|||||||
|
|
||||||
. ./test-lib.sh
|
. ./test-lib.sh
|
||||||
|
|
||||||
cmp () {
|
|
||||||
diff -w "$@"
|
|
||||||
}
|
|
||||||
|
|
||||||
test_expect_success setup '
|
test_expect_success setup '
|
||||||
echo hello >one &&
|
echo hello >one &&
|
||||||
git update-index --add one &&
|
git update-index --add one &&
|
||||||
|
|||||||
@@ -42,8 +42,7 @@ test_expect_success 'apply in reverse' '
|
|||||||
git reset --hard second &&
|
git reset --hard second &&
|
||||||
git apply --reverse --binary --index patch &&
|
git apply --reverse --binary --index patch &&
|
||||||
git diff >diff &&
|
git diff >diff &&
|
||||||
: > empty &&
|
test_cmp /dev/null diff
|
||||||
test_cmp empty diff
|
|
||||||
|
|
||||||
'
|
'
|
||||||
|
|
||||||
|
|||||||
@@ -107,10 +107,6 @@ test_expect_success 'remove remote' '
|
|||||||
)
|
)
|
||||||
'
|
'
|
||||||
|
|
||||||
case $(uname -s) in
|
|
||||||
*MINGW*) pwd() { builtin pwd -W; } ;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
test_expect_success 'remove remote protects non-remote branches' '
|
test_expect_success 'remove remote protects non-remote branches' '
|
||||||
(
|
(
|
||||||
cd test &&
|
cd test &&
|
||||||
|
|||||||
@@ -4,8 +4,6 @@ test_description='refspec parsing'
|
|||||||
|
|
||||||
. ./test-lib.sh
|
. ./test-lib.sh
|
||||||
|
|
||||||
test_expect=test_expect_success
|
|
||||||
|
|
||||||
test_refspec () {
|
test_refspec () {
|
||||||
|
|
||||||
kind=$1 refspec=$2 expect=$3
|
kind=$1 refspec=$2 expect=$3
|
||||||
@@ -21,7 +19,7 @@ test_refspec () {
|
|||||||
title="$kind $refspec (invalid)"
|
title="$kind $refspec (invalid)"
|
||||||
test='test_must_fail git ls-remote frotz'
|
test='test_must_fail git ls-remote frotz'
|
||||||
fi
|
fi
|
||||||
$test_expect "$title" "$test"
|
test_expect_success "$title" "$test"
|
||||||
}
|
}
|
||||||
|
|
||||||
test_refspec push '' invalid
|
test_refspec push '' invalid
|
||||||
@@ -51,14 +49,7 @@ test_refspec fetch 'refs/heads/*:refs/remotes/frotz/*'
|
|||||||
test_refspec fetch 'refs/heads/*:refs/remotes/frotz' invalid
|
test_refspec fetch 'refs/heads/*:refs/remotes/frotz' invalid
|
||||||
test_refspec fetch 'refs/heads:refs/remotes/frotz/*' invalid
|
test_refspec fetch 'refs/heads:refs/remotes/frotz/*' invalid
|
||||||
test_refspec fetch 'refs/heads/master:refs/remotes/frotz/xyzzy'
|
test_refspec fetch 'refs/heads/master:refs/remotes/frotz/xyzzy'
|
||||||
|
|
||||||
case $(uname -s) in
|
|
||||||
*MINGW*) test_expect=test_expect_failure;;
|
|
||||||
*) test_expect=test_expect_success;;
|
|
||||||
esac
|
|
||||||
test_refspec fetch 'refs/heads/master::refs/remotes/frotz/xyzzy' invalid
|
test_refspec fetch 'refs/heads/master::refs/remotes/frotz/xyzzy' invalid
|
||||||
test_expect=test_expect_success
|
|
||||||
|
|
||||||
test_refspec fetch 'refs/heads/maste :refs/remotes/frotz/xyzzy' invalid
|
test_refspec fetch 'refs/heads/maste :refs/remotes/frotz/xyzzy' invalid
|
||||||
|
|
||||||
test_refspec push 'master~1:refs/remotes/frotz/backup'
|
test_refspec push 'master~1:refs/remotes/frotz/backup'
|
||||||
@@ -81,16 +72,4 @@ test_refspec fetch ':refs/remotes/frotz/HEAD-to-me'
|
|||||||
test_refspec push ':refs/remotes/frotz/delete me' invalid
|
test_refspec push ':refs/remotes/frotz/delete me' invalid
|
||||||
test_refspec fetch ':refs/remotes/frotz/HEAD to me' invalid
|
test_refspec fetch ':refs/remotes/frotz/HEAD to me' invalid
|
||||||
|
|
||||||
test_refspec fetch 'refs/heads/*/for-linus:refs/remotes/mine/*-blah' invalid
|
|
||||||
test_refspec push 'refs/heads/*/for-linus:refs/remotes/mine/*-blah' invalid
|
|
||||||
|
|
||||||
test_refspec fetch 'refs/heads*/for-linus:refs/remotes/mine/*' invalid
|
|
||||||
test_refspec push 'refs/heads*/for-linus:refs/remotes/mine/*' invalid
|
|
||||||
|
|
||||||
test_refspec fetch 'refs/heads/*/*/for-linus:refs/remotes/mine/*' invalid
|
|
||||||
test_refspec push 'refs/heads/*/*/for-linus:refs/remotes/mine/*' invalid
|
|
||||||
|
|
||||||
test_refspec fetch 'refs/heads/*/for-linus:refs/remotes/mine/*'
|
|
||||||
test_refspec push 'refs/heads/*/for-linus:refs/remotes/mine/*'
|
|
||||||
|
|
||||||
test_done
|
test_done
|
||||||
|
|||||||
@@ -207,11 +207,7 @@ test_expect_success 'checkout to detach HEAD with branchname^' '
|
|||||||
fi
|
fi
|
||||||
'
|
'
|
||||||
|
|
||||||
case $(uname -s) in
|
test_expect_success 'checkout to detach HEAD with :/message' '
|
||||||
*MINGW*) test_expect=test_expect_failure;;
|
|
||||||
*) test_expect=test_expect_success;;
|
|
||||||
esac
|
|
||||||
$test_expect 'checkout to detach HEAD with :/message' '
|
|
||||||
|
|
||||||
git checkout -f master && git clean -f &&
|
git checkout -f master && git clean -f &&
|
||||||
git checkout ":/Initial" &&
|
git checkout ":/Initial" &&
|
||||||
|
|||||||
Reference in New Issue
Block a user