Merge branch 'rj/cygwin-test-fixes-for-2.53'

gitster · gitster · commit cd8b8cba4764 · 2026-01-23T13:34:36.000-08:00
Test fixup.

* rj/cygwin-test-fixes-for-2.53:
  t0610-reftable-basics: mitigate a flaky test on cygwin
  t9700/test.pl: fix path type expectation on cygwin
diff --git a/t/t0610-reftable-basics.sh b/t/t0610-reftable-basics.sh
@@ -207,7 +207,7 @@ test_expect_success 'ref transaction: corrupted tables cause failure' '
 		test_commit file1 &&
 		for f in .git/reftable/*.ref
 		do
-			: >"$f" || return 1
+			test-tool truncate "$f" 0 || return 1
 		done &&
 		test_must_fail git update-ref refs/heads/main HEAD
 	)
diff --git a/t/t9700/test.pl b/t/t9700/test.pl
@@ -118,7 +118,7 @@ sub adjust_dirsep {
 
 # paths
 my $abs_git_dir = $abs_repo_dir . "/.git";
-if ($^O eq 'msys' or $^O eq 'cygwin') {
+if ($^O eq 'msys') {
   $abs_git_dir = `cygpath -am "$abs_repo_dir/.git"`;
   $abs_git_dir =~ s/\r?\n?$//;
 }

Original file line number	Diff line number	Diff line change
`@@ -207,7 +207,7 @@ test_expect_success 'ref transaction: corrupted tables cause failure' '`
`207`	`207`	`test_commit file1 &&`
`208`	`208`	`for f in .git/reftable/*.ref`
`209`	`209`	`do`
`210`		`- : >"$f" \|\| return 1`
	`210`	`+ test-tool truncate "$f" 0 \|\| return 1`
`211`	`211`	`done &&`
`212`	`212`	`test_must_fail git update-ref refs/heads/main HEAD`
`213`	`213`	`)`
Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ sub adjust_dirsep {`
`118`	`118`
`119`	`119`	`# paths`
`120`	`120`	`my $abs_git_dir = $abs_repo_dir . "/.git";`
`121`		`-if ($^O eq 'msys' or $^O eq 'cygwin') {`
	`121`	`+if ($^O eq 'msys') {`
`122`	`122`	$abs_git_dir = `cygpath -am "$abs_repo_dir/.git"`;
`123`	`123`	`$abs_git_dir =~ s/\r?\n?$//;`
`124`	`124`	`}`