fixup! Merge 'win-tests-fixes' into HEAD

This reverts commit 616c7ba, reversing
changes made to 85efa6f.

Stepan Kasal provided a rebased version of this topic branch. Let's revert
the old version first.

Signed-off-by: Johannes Schindelin <[email protected]>

Author: dscho

Makefile

@@ -1482,9 +1482,6 @@ ifdef NO_REGEX
 	COMPAT_CFLAGS += -Icompat/regex
 	COMPAT_OBJS += compat/regex/regex.o
 endif
-ifdef NATIVE_CRLF
-	BASIC_CFLAGS += -DNATIVE_CRLF
-endif
 
 ifdef USE_NED_ALLOCATOR
        COMPAT_CFLAGS += -Icompat/nedmalloc

git-am.sh

@@ -182,9 +182,7 @@ It does not apply to blobs recorded in its index.")"
 }
 
 clean_abort () {
-	test $# = 0 || cat >&2 <<EOF
-$@
-EOF
+	test $# = 0 || echo >&2 "$@"
 	rm -fr "$dotest"
 	exit 1
 }

git-merge-octopus.sh

@@ -71,9 +71,7 @@ do
 
 	case "$LF$common$LF" in
 	*"$LF$SHA1$LF"*)
-		cat << EOF
-Already up-to-date with $pretty_name
-EOF
+		echo "Already up-to-date with $pretty_name"
 		continue
 		;;
 	esac
@@ -85,19 +83,15 @@ EOF
 		# tree as the intermediate result of the merge.
 		# We still need to count this as part of the parent set.
 
-		cat << EOF
-Fast-forwarding to: $pretty_name
-EOF
+		echo "Fast-forwarding to: $pretty_name"
 		git read-tree -u -m $head $SHA1 || exit
 		MRC=$SHA1 MRT=$(git write-tree)
 		continue
 	fi
 
 	NON_FF_MERGE=1
 
-	cat << EOF
-Trying simple merge with $pretty_name
-EOF
+	echo "Trying simple merge with $pretty_name"
 	git read-tree -u -m --aggressive  $common $MRT $SHA1 || exit 2
 	next=$(git write-tree 2>/dev/null)
 	if test $? -ne 0

git-sh-setup.sh

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

git-submodule.sh

@@ -428,11 +428,9 @@ cmd_add()
 
 	if test -z "$force" && ! git add --dry-run --ignore-missing "$sm_path" > /dev/null 2>&1
 	then
-		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
+		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
 		exit 1
 	fi
 

t/annotate-tests.sh

@@ -251,27 +251,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
@@ -337,31 +337,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-credential.sh

@@ -19,7 +19,7 @@ check() {
 		false
 	fi &&
 	test_cmp expect-stdout stdout &&
-	test_cmp_text expect-stderr stderr
+	test_cmp expect-stderr stderr
 }
 
 read_chunk() {

t/t0008-ignores.sh

@@ -5,13 +5,7 @@ test_description=check-ignore
 . ./test-lib.sh
 
 init_vars () {
-	# 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
+	global_excludes="$(pwd)/global-excludes"
 }
 
 enable_global_excludes () {

t/t0026-eol-config.sh

@@ -80,22 +80,4 @@ test_expect_success 'autocrlf=true overrides unset eol' '
 	test -z "$onediff" -a -z "$twodiff"
 '
 
-test_expect_success NATIVE_CRLF 'eol native is crlf' '
-
-	rm -rf native_eol && mkdir native_eol &&
-	( cd native_eol &&
-	printf "*.txt text\n" > .gitattributes
-	printf "one\r\ntwo\r\nthree\r\n" > filedos.txt
-	printf "one\ntwo\nthree\n" > fileunix.txt
-	git init &&
-	git config core.autocrlf false &&
-	git config core.eol native &&
-	git add filedos.txt fileunix.txt &&
-	git commit -m "first" &&
-	rm file*.txt &&
-	git reset --hard HEAD &&
-	has_cr filedos.txt && has_cr fileunix.txt
-	)
-'
-
 test_done

t/t0081-line-buffer.sh

@@ -29,7 +29,7 @@ test_expect_success '0-length read, send along greeting' '
 	test_cmp expect actual
 '
 
-test_expect_success NOT_MINGW 'read from file descriptor' '
+test_expect_success 'read from file descriptor' '
 	rm -f input &&
 	echo hello >expect &&
 	echo hello >input &&