Merge branch 'nd/diff-quiet-stat-dirty'

diff --git a/t/t0060-path-utils.sh b/t/t0060-path-utils.sh
index 92976e0402ff5cd017accc604243a2a50b54bc29..07c10c8dca80b9d289431a72d5bf120ca442113d 100755 (executable)
--- a/t/t0060-path-utils.sh
+++ b/t/t0060-path-utils.sh
@@ -8,13 +8,13 @@ test_description='Test various path utilities'
 . ./test-lib.sh
 
 norm_path() {
-       expected=$(test-path-utils mingw_path "$2")
+       expected=$(test-path-utils print_path "$2")
        test_expect_success $3 "normalize path: $1 => $2" \
        "test \"\$(test-path-utils normalize_path_copy '$1')\" = '$expected'"
 }
 
 relative_path() {
-       expected=$(test-path-utils mingw_path "$3")
+       expected=$(test-path-utils print_path "$3")
        test_expect_success $4 "relative path: $1 $2 => $3" \
        "test \"\$(test-path-utils relative_path '$1' '$2')\" = '$expected'"
 }
@@ -210,6 +210,10 @@ relative_path foo/a/b/             foo/a/b         ./
 relative_path foo/a            foo/a/b         ../
 relative_path foo/x/y          foo/a/b         ../../x/y
 relative_path foo/a/c          foo/a/b         ../c
+relative_path foo/a/b          /foo/x/y        foo/a/b
+relative_path /foo/a/b         foo/x/y         /foo/a/b
+relative_path d:/a/b           D:/a/c          ../b            MINGW
+relative_path C:/a/b           D:/a/c          C:/a/b          MINGW
 relative_path foo/a/b          "<empty>"       foo/a/b
 relative_path foo/a/b          "<null>"        foo/a/b
 relative_path "<empty>"                /foo/a/b        ./