File tree Expand file tree Collapse file tree 2 files changed +12
-4
lines changed Expand file tree Collapse file tree 2 files changed +12
-4
lines changed Original file line number Diff line number Diff line change @@ -1028,11 +1028,14 @@ test_expect_success 'git cat-file --batch-check --follow-symlinks works for out-
1028
1028
test_cmp expect actual &&
1029
1029
echo symlink 3 >expect &&
1030
1030
echo ../ >>expect &&
1031
- echo HEAD:dir/subdir/out-of-repo-link-dir-trailing | git cat-file --batch-check --follow-symlinks >actual &&
1032
- test_cmp expect actual
1031
+ if test_have_prereq !MINGW
1032
+ then
1033
+ echo HEAD:dir/subdir/out-of-repo-link-dir-trailing | git cat-file --batch-check --follow-symlinks >actual &&
1034
+ test_cmp expect actual
1035
+ fi
1033
1036
'
1034
1037
1035
- test_expect_success ' git cat-file --batch-check --follow-symlinks works for symlinks with internal ..' '
1038
+ test_expect_success ! MINGW ' git cat-file --batch-check --follow-symlinks works for symlinks with internal ..' '
1036
1039
echo HEAD: | git cat-file --batch-check >expect &&
1037
1040
echo HEAD:up-down | git cat-file --batch-check --follow-symlinks >actual &&
1038
1041
test_cmp expect actual &&
Original file line number Diff line number Diff line change @@ -5035,7 +5035,12 @@ test_setup_12m () {
5035
5035
git switch B &&
5036
5036
git rm dir/subdir/file &&
5037
5037
mkdir dir &&
5038
- ln -s /dev/null dir/subdir &&
5038
+ if test_have_prereq MINGW
5039
+ then
5040
+ cmd //c ' mklink dir\subdir NUL'
5041
+ else
5042
+ ln -s /dev/null dir/subdir
5043
+ fi &&
5039
5044
git add . &&
5040
5045
git commit -m " B"
5041
5046
)
You can’t perform that action at this time.
0 commit comments