WIP

Author: dscho

t/t1006-cat-file.sh

@@ -1028,11 +1028,14 @@ test_expect_success 'git cat-file --batch-check --follow-symlinks works for out-
 	test_cmp expect actual &&
 	echo symlink 3 >expect &&
 	echo ../ >>expect &&
-	echo HEAD:dir/subdir/out-of-repo-link-dir-trailing | git cat-file --batch-check --follow-symlinks >actual &&
-	test_cmp expect actual
+	if test_have_prereq !MINGW
+	then
+		echo HEAD:dir/subdir/out-of-repo-link-dir-trailing | git cat-file --batch-check --follow-symlinks >actual &&
+		test_cmp expect actual
+	fi
 '
 
-test_expect_success 'git cat-file --batch-check --follow-symlinks works for symlinks with internal ..' '
+test_expect_success !MINGW 'git cat-file --batch-check --follow-symlinks works for symlinks with internal ..' '
 	echo HEAD: | git cat-file --batch-check >expect &&
 	echo HEAD:up-down | git cat-file --batch-check --follow-symlinks >actual &&
 	test_cmp expect actual &&

t/t6423-merge-rename-directories.sh

@@ -5035,7 +5035,12 @@ test_setup_12m () {
 		git switch B &&
 		git rm dir/subdir/file &&
 		mkdir dir &&
-		ln -s /dev/null dir/subdir &&
+		if test_have_prereq MINGW
+		then
+			cmd //c 'mklink dir\subdir NUL'
+		else
+			ln -s /dev/null dir/subdir
+		fi &&
 		git add . &&
 		git commit -m "B"
 	)