Skip to content

Commit e076ce3

Browse files
committed
WIP
1 parent 4655496 commit e076ce3

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

t/t1006-cat-file.sh

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1028,11 +1028,14 @@ test_expect_success 'git cat-file --batch-check --follow-symlinks works for out-
10281028
test_cmp expect actual &&
10291029
echo symlink 3 >expect &&
10301030
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
10331036
'
10341037

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 ..' '
10361039
echo HEAD: | git cat-file --batch-check >expect &&
10371040
echo HEAD:up-down | git cat-file --batch-check --follow-symlinks >actual &&
10381041
test_cmp expect actual &&

t/t6423-merge-rename-directories.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5035,7 +5035,12 @@ test_setup_12m () {
50355035
git switch B &&
50365036
git rm dir/subdir/file &&
50375037
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 &&
50395044
git add . &&
50405045
git commit -m "B"
50415046
)

0 commit comments

Comments
 (0)