diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-02-17 10:13:28 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-02-17 10:13:29 -0800 |
| commit | 4b589e5b28af077ddbdd5b72b6217c7447d45cb5 (patch) | |
| tree | 778e54e0927aa51f78a027c71af44f703270bcd8 /t/t1508-at-combinations.sh | |
| parent | 9f03176ef679ea5e0fb9088529180db72ae0764b (diff) | |
| parent | 80ce6c25a4289835e197004a54ca75401bea55dc (diff) | |
| download | git-4b589e5b28af077ddbdd5b72b6217c7447d45cb5.tar.gz git-4b589e5b28af077ddbdd5b72b6217c7447d45cb5.tar.xz | |
Merge branch 'js/mingw-tests'
Test scripts have been updated to remove assumptions that are not
portable between Git for POSIX and Git for Windows, or to skip ones
with expectations that are not satisfiable on Git for Windows.
* js/mingw-tests: (21 commits)
gitignore: ignore generated test-fake-ssh executable
mingw: do not bother to test funny file names
mingw: skip a test in t9130 that cannot pass on Windows
mingw: handle the missing POSIXPERM prereq in t9124
mingw: avoid illegal filename in t9118
mingw: mark t9100's test cases with appropriate prereqs
t0008: avoid absolute path
mingw: work around pwd issues in the tests
mingw: fix t9700's assumption about directory separators
mingw: skip test in t1508 that fails due to path conversion
tests: turn off git-daemon tests if FIFOs are not available
mingw: disable mkfifo-based tests
mingw: accomodate t0060-path-utils for MSYS2
mingw: fix t5601-clone.sh
mingw: let lstat() fail with errno == ENOTDIR when appropriate
mingw: try to delete target directory before renaming
mingw: prepare the TMPDIR environment variable for shell scripts
mingw: factor out Windows specific environment setup
Git.pm: stop assuming that absolute paths start with a slash
mingw: do not trust MSYS2's MinGW gettext.sh
...
Diffstat (limited to 't/t1508-at-combinations.sh')
| -rwxr-xr-x | t/t1508-at-combinations.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/t/t1508-at-combinations.sh b/t/t1508-at-combinations.sh index 078e1195d..4a9964e9d 100755 --- a/t/t1508-at-combinations.sh +++ b/t/t1508-at-combinations.sh @@ -35,7 +35,10 @@ test_expect_success 'setup' ' git checkout -b upstream-branch && test_commit upstream-one && test_commit upstream-two && - git checkout -b @/at-test && + if test_have_prereq !MINGW + then + git checkout -b @/at-test + fi && git checkout -b @@/at-test && git checkout -b @at-test && git checkout -b old-branch && @@ -64,6 +67,7 @@ check "@{-1}@{u}@{1}" commit master-one check "@" commit new-two check "@@{u}" ref refs/heads/upstream-branch check "@@/at-test" ref refs/heads/@@/at-test +test_have_prereq MINGW || check "@/at-test" ref refs/heads/@/at-test check "@at-test" ref refs/heads/@at-test nonsense "@{u}@{-1}" |