mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
Tests on Windows: $(pwd) must return Windows-style paths
Many tests pass $(pwd) in some form to git and later test that the output of git contains the correct value of $(pwd). For example, the test of 'git remote show' sets up a remote that contains $(pwd) and then the expected result must contain $(pwd). Again, MSYS-bash's path mangling kicks in: Plain $(pwd) uses the MSYS style absolute path /c/path/to/git. The test case would write this name into the 'expect' file. But when git is invoked, MSYS-bash converts this name to the Windows style path c:/path/to/git, and git would produce this form in the result; the test would fail. We fix this by passing -W to bash's pwd that produces the Windows-style path. There are a two cases that need an accompanying change: - In t1504 the value of $(pwd) becomes part of a path list. In this case, the lone 'c' in something like /foo:c:/path/to/git:/bar inhibits MSYS-bashes path mangling; IOW in this case we want the /c/path/to/git form to allow path mangling. We use $PWD instead of $(pwd), which always has the latter form. - In t6200, $(pwd) - the Windows style path - must be used to construct the expected result because that is the path form that git sees. (The change in the test itself is just for consistency: 'git fetch' always sees the Windows-style path, with or without the change.) Signed-off-by: Johannes Sixt <j6t@kdbg.org>
This commit is contained in:
parent
5397ea314f
commit
4114156ae9
|
@ -13,7 +13,7 @@ test_fail() {
|
|||
"git rev-parse --show-prefix"
|
||||
}
|
||||
|
||||
TRASH_ROOT="$(pwd)"
|
||||
TRASH_ROOT="$PWD"
|
||||
ROOT_PARENT=$(dirname "$TRASH_ROOT")
|
||||
|
||||
|
||||
|
|
|
@ -83,13 +83,13 @@ test_expect_success 'merge-msg test #1' '
|
|||
'
|
||||
|
||||
cat >expected <<EOF
|
||||
Merge branch 'left' of $TEST_DIRECTORY/$test
|
||||
Merge branch 'left' of $(pwd)
|
||||
EOF
|
||||
|
||||
test_expect_success 'merge-msg test #2' '
|
||||
|
||||
git checkout master &&
|
||||
git fetch "$TEST_DIRECTORY/$test" left &&
|
||||
git fetch "$(pwd)" left &&
|
||||
|
||||
git fmt-merge-msg <.git/FETCH_HEAD >actual &&
|
||||
test_cmp expected actual
|
||||
|
|
|
@ -649,5 +649,9 @@ case $(uname -s) in
|
|||
sum () {
|
||||
md5sum "$@"
|
||||
}
|
||||
# git sees Windows-style pwd
|
||||
pwd () {
|
||||
builtin pwd -W
|
||||
}
|
||||
;;
|
||||
esac
|
||||
|
|
Loading…
Reference in a new issue