Merge 'win-tests-fixes' into HEAD

Author: dscho

git-sh-setup.sh

@@ -59,7 +59,9 @@ GIT_QUIET=
 say () {
 	if test -z "$GIT_QUIET"
 	then
-		printf '%s\n' "$*"
+		cat <<EOF
+$*
+EOF
 	fi
 }
 

git-submodule.sh

@@ -434,9 +434,11 @@ cmd_add()
 
 	if test -z "$force" && ! git add --dry-run --ignore-missing "$sm_path" > /dev/null 2>&1
 	then
-		eval_gettextln "The following path is ignored by one of your .gitignore files:
-\$sm_path
-Use -f if you really want to add it." >&2
+		cat >&2 <<EOF
+The following path is ignored by one of your .gitignore files:
+$(eval_gettextln $sm_path)
+Use -f if you really want to add it.
+EOF
 		exit 1
 	fi
 

t/annotate-tests.sh

@@ -263,27 +263,27 @@ test_expect_success 'blame -L X,-N' '
 '
 
 test_expect_success 'blame -L /RE/ (RE to end)' '
-	check_count -L/evil/ C 1 "A U Thor" 1
+	check_count -L/\;*evil/ C 1 "A U Thor" 1
 '
 
 test_expect_success 'blame -L /RE/,/RE2/' '
-	check_count -L/robot/,/green/ A 1 B 1 B2 1 D 1 E 1
+	check_count -L/\;*robot/,/\;*green/ A 1 B 1 B2 1 D 1 E 1
 '
 
 test_expect_success 'blame -L X,/RE/' '
-	check_count -L5,/evil/ B1 1 D 1 "A U Thor" 1
+	check_count -L5,/\;*evil/ B1 1 D 1 "A U Thor" 1
 '
 
 test_expect_success 'blame -L /RE/,Y' '
-	check_count -L/99/,7 B1 1 D 1 "A U Thor" 1
+	check_count -L/\;*99/,7 B1 1 D 1 "A U Thor" 1
 '
 
 test_expect_success 'blame -L /RE/,+N' '
-	check_count -L/99/,+3 B1 1 D 1 "A U Thor" 1
+	check_count -L/\;*99/,+3 B1 1 D 1 "A U Thor" 1
 '
 
 test_expect_success 'blame -L /RE/,-N' '
-	check_count -L/99/,-3 B 1 B2 1 D 1
+	check_count -L/\;*99/,-3 B 1 B2 1 D 1
 '
 
 # 'file' ends with an incomplete line, so 'wc' reports one fewer lines than
@@ -349,31 +349,31 @@ test_expect_success 'blame -L multiple (superset/subset: unordered)' '
 '
 
 test_expect_success 'blame -L /RE/ (relative)' '
-	check_count -L3,3 -L/fox/ B1 1 B2 1 C 1 D 1 "A U Thor" 1
+	check_count -L3,3 -L/\;*fox/ B1 1 B2 1 C 1 D 1 "A U Thor" 1
 '
 
 test_expect_success 'blame -L /RE/ (relative: no preceding range)' '
-	check_count -L/dog/ A 1 B 1 B1 1 B2 1 C 1 D 1 "A U Thor" 1
+	check_count -L/\;*dog/ A 1 B 1 B1 1 B2 1 C 1 D 1 "A U Thor" 1
 '
 
 test_expect_success 'blame -L /RE/ (relative: adjacent)' '
-	check_count -L1,1 -L/dog/,+1 A 1 E 1
+	check_count -L1,1 -L/\;*dog/,+1 A 1 E 1
 '
 
 test_expect_success 'blame -L /RE/ (relative: not found)' '
-	test_must_fail $PROG -L4,4 -L/dog/ file
+	test_must_fail $PROG -L4,4 -L/\;*dog/ file
 '
 
 test_expect_success 'blame -L /RE/ (relative: end-of-file)' '
 	test_must_fail $PROG -L, -L/$/ file
 '
 
 test_expect_success 'blame -L ^/RE/ (absolute)' '
-	check_count -L3,3 -L^/dog/,+2 A 1 B2 1
+	check_count -L3,3 -L^/\;*dog/,+2 A 1 B2 1
 '
 
 test_expect_success 'blame -L ^/RE/ (absolute: no preceding range)' '
-	check_count -L^/dog/,+2 A 1 B2 1
+	check_count -L^/\;*dog/,+2 A 1 B2 1
 '
 
 test_expect_success 'blame -L ^/RE/ (absolute: not found)' '

t/lib-git-daemon.sh

@@ -23,6 +23,11 @@ then
 	test_done
 fi
 
+if ! test_have_prereq PIPE
+then
+	test_skip_or_die $GIT_TEST_GIT_DAEMON "file system does not support FIFOs"
+fi
+
 LIB_GIT_DAEMON_PORT=${LIB_GIT_DAEMON_PORT-${this_test#t}}
 
 GIT_DAEMON_PID=

t/t0008-ignores.sh

@@ -5,7 +5,13 @@ test_description=check-ignore
 . ./test-lib.sh
 
 init_vars () {
-	global_excludes="$(pwd)/global-excludes"
+	# On Windows, avoid using "C:" in the global-excludes paths.
+	if test_have_prereq MINGW
+	then
+		global_excludes="global-excludes"
+	else
+		global_excludes="$(pwd)/global-excludes"
+	fi
 }
 
 enable_global_excludes () {

t/t0021-conversion.sh

@@ -204,7 +204,7 @@ test_expect_success 'filtering large input to small output should use little mem
 	GIT_MMAP_LIMIT=1m GIT_ALLOC_LIMIT=1m git add 30MB
 '
 
-test_expect_success EXPENSIVE 'filter large file' '
+test_expect_success EXPENSIVE,!MINGW 'filter large file' '
 	git config filter.largefile.smudge cat &&
 	git config filter.largefile.clean cat &&
 	for i in $(test_seq 1 2048); do printf "%1048576d" 1; done >2GB &&

t/t0027-auto-crlf.sh

@@ -4,9 +4,9 @@ test_description='CRLF conversion all combinations'
 
 . ./test-lib.sh
 
-if ! test_have_prereq EXPENSIVE
+if ! test_have_prereq EXPENSIVE && ! test_have_prereq MINGW
 then
-	skip_all="EXPENSIVE not set"
+	skip_all="Neither EXPENSIVE nor MINGW set"
 	test_done
 fi
 
@@ -55,11 +55,17 @@ create_gitattributes () {
 	esac
 }
 
+# Some warnings depend on the native end-of-line marker
+
+test_have_prereq NATIVE_CRLF &&
+NATIVE_CRLF=t ||
+NATIVE_CRLF=
+
 check_warning () {
-	case "$1" in
-	LF_CRLF) grep "LF will be replaced by CRLF" $2;;
-	CRLF_LF) grep "CRLF will be replaced by LF" $2;;
-	'')
+	case "$1,$NATIVE_CRLF" in
+	LF_CRLF,*|MAYBE_CRLF,t|MIX,t) grep "LF will be replaced by CRLF" $2;;
+	CRLF_LF,*|MAYBE_LF,|MIX,) grep "CRLF will be replaced by LF" $2;;
+	,*|MAYBE_CRLF,|MAYBE_LF,t)
 		>expect
 		grep "will be replaced by" $2 >actual
 		test_cmp expect actual
@@ -175,16 +181,17 @@ test_expect_success 'add files empty attr' '
 	create_file_in_repo input ""     ""        "CRLF_LF" "CRLF_LF" ""        ""
 '
 
+
 test_expect_success 'add files attr=auto' '
-	create_file_in_repo false "auto" ""        "CRLF_LF" "CRLF_LF" ""        "" &&
-	create_file_in_repo true  "auto" "LF_CRLF" ""        "LF_CRLF" ""        "" &&
-	create_file_in_repo input "auto" ""        "CRLF_LF" "CRLF_LF" ""        ""
+	create_file_in_repo false "auto" "MAYBE_CRLF" "MAYBE_LF" "MIX"     ""        "" &&
+	create_file_in_repo true  "auto" "LF_CRLF"    ""         "LF_CRLF" ""        "" &&
+	create_file_in_repo input "auto" ""           "CRLF_LF"  "CRLF_LF" ""        ""
 '
 
 test_expect_success 'add files attr=text' '
-	create_file_in_repo false "text" ""        "CRLF_LF" "CRLF_LF" ""        "CRLF_LF" &&
-	create_file_in_repo true  "text" "LF_CRLF" ""        "LF_CRLF" "LF_CRLF" ""        &&
-	create_file_in_repo input "text" ""        "CRLF_LF" "CRLF_LF" ""        "CRLF_LF"
+	create_file_in_repo false "text" "MAYBE_CRLF" "MAYBE_LF" "MIX"    "MAYBE_CRLF" "MAYBE_LF" &&
+	create_file_in_repo true  "text" "LF_CRLF"    ""        "LF_CRLF" "LF_CRLF"    ""        &&
+	create_file_in_repo input "text" ""           "CRLF_LF" "CRLF_LF" ""           "CRLF_LF"
 '
 
 test_expect_success 'add files attr=-text' '

t/t0200-gettext-basic.sh

@@ -58,7 +58,7 @@ test_expect_success GETTEXT_LOCALE 'sanity: gettext(unknown) is passed through'
 '
 
 # xgettext from C
-test_expect_success GETTEXT_LOCALE 'xgettext: C extraction of _() and N_() strings' '
+test_expect_success GETTEXT_LOCALE,!MINGW 'xgettext: C extraction of _() and N_() strings' '
     printf "TILRAUN: C tilraunastrengur" >expect &&
     printf "\n" >>expect &&
     printf "Sjá '\''git help SKIPUN'\'' til að sjá hjálp fyrir tiltekna skipun." >>expect &&
@@ -81,7 +81,7 @@ test_expect_success GETTEXT_LOCALE 'xgettext: Shell extraction' '
     test_cmp expect actual
 '
 
-test_expect_success GETTEXT_LOCALE 'xgettext: Shell extraction with $variable' '
+test_expect_success GETTEXT_LOCALE,!MINGW 'xgettext: Shell extraction with $variable' '
     printf "TILRAUN: Skeljartilraunastrengur með breytunni a var i able" >x-expect &&
     LANGUAGE=is LC_ALL="$is_IS_locale" variable="a var i able" eval_gettext "TEST: A Shell test \$variable" >x-actual &&
     test_cmp x-expect x-actual
@@ -94,7 +94,7 @@ test_expect_success GETTEXT_LOCALE 'xgettext: Perl extraction' '
     test_cmp expect actual
 '
 
-test_expect_success GETTEXT_LOCALE 'xgettext: Perl extraction with %s' '
+test_expect_success GETTEXT_LOCALE,!MINGW 'xgettext: Perl extraction with %s' '
     printf "TILRAUN: Perl tilraunastrengur með breytunni %%s" >expect &&
     LANGUAGE=is LC_ALL="$is_IS_locale" gettext "TEST: A Perl test variable %s" >actual &&
     test_cmp expect actual

t/t0204-gettext-reencode-sanity.sh

@@ -7,6 +7,15 @@ test_description="Gettext reencoding of our *.po/*.mo files works"
 
 . ./lib-gettext.sh
 
+if test_have_prereq MINGW
+then
+	# There is no MinGW 'locale', but an MSys2 one that interferes
+	# with this test (the MinGW and MSys2 locales are in fundamentally
+	# different realms).
+	skip_all='No native locale.exe available'
+	test_done
+fi
+
 # The constants used in a tricky observation for undefined behaviour
 RUNES="TILRAUN: ᚻᛖ ᚳᚹᚫᚦ ᚦᚫᛏ ᚻᛖ ᛒᚢᛞᛖ ᚩᚾ ᚦᚫᛗ ᛚᚪᚾᛞᛖ ᚾᚩᚱᚦᚹᛖᚪᚱᛞᚢᛗ ᚹᛁᚦ ᚦᚪ ᚹᛖᛥᚫ"
 PUNTS="TILRAUN: ?? ???? ??? ?? ???? ?? ??? ????? ??????????? ??? ?? ????"

t/t1501-worktree.sh

@@ -339,6 +339,10 @@ test_expect_success 'make_relative_path handles double slashes in GIT_DIR' '
 	git --git-dir="$(pwd)//repo.git" --work-tree="$(pwd)" add dummy_file
 '
 
+test_have_prereq MINGW &&
+# make sure to test DOS path on Windows
+TRASH_DIRECTORY="$(cd "$TRASH_DIRECTORY" && pwd)"
+
 test_expect_success 'relative $GIT_WORK_TREE and git subprocesses' '
 	GIT_DIR=repo.git GIT_WORK_TREE=repo.git/work \
 	test-subprocess --setup-work-tree rev-parse --show-toplevel >actual &&