Skip to content

Commit 13f17f3

Browse files
committed
Merge branch 'jx/clean-interactive'
* jx/clean-interactive: path-utils test: rename mingw_path function to print_path
2 parents 92d2afd + 7ffd18f commit 13f17f3

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

t/t0060-path-utils.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ test_description='Test various path utilities'
88
. ./test-lib.sh
99

1010
norm_path() {
11-
expected=$(test-path-utils mingw_path "$2")
11+
expected=$(test-path-utils print_path "$2")
1212
test_expect_success $3 "normalize path: $1 => $2" \
1313
"test \"\$(test-path-utils normalize_path_copy '$1')\" = '$expected'"
1414
}
1515

1616
relative_path() {
17-
expected=$(test-path-utils mingw_path "$3")
17+
expected=$(test-path-utils print_path "$3")
1818
test_expect_success $4 "relative path: $1 $2 => $3" \
1919
"test \"\$(test-path-utils relative_path '$1' '$2')\" = '$expected'"
2020
}

test-path-utils.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ int main(int argc, char **argv)
116116
return 0;
117117
}
118118

119-
if (argc == 3 && !strcmp(argv[1], "mingw_path")) {
119+
if (argc == 3 && !strcmp(argv[1], "print_path")) {
120120
puts(argv[2]);
121121
return 0;
122122
}

0 commit comments

Comments
 (0)