diff options
| author | Junio C Hamano <gitster@pobox.com> | 2026-01-23 13:34:35 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2026-01-23 13:34:36 -0800 |
| commit | cd8b8cba47648abcd6878c619128e1f2dd4ce8b3 (patch) | |
| tree | cb84d5ac1723bf62f2b909f919252c497bedb5a7 | |
| parent | cfa173a5fa09e265c18b27f84ca8cabf2fecfbd6 (diff) | |
| parent | 59da9f292a1da89d4f6972dc2f8dfd225c01cc21 (diff) | |
| download | git-cd8b8cba47648abcd6878c619128e1f2dd4ce8b3.tar.xz | |
Merge branch 'rj/cygwin-test-fixes-for-2.53'
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
| -rwxr-xr-x | t/t0610-reftable-basics.sh | 2 | ||||
| -rwxr-xr-x | t/t9700/test.pl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/t/t0610-reftable-basics.sh b/t/t0610-reftable-basics.sh index 6575528f21..e19e036898 100755 --- 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 index 570b0c5680..f83e6169e2 100755 --- a/t/t9700/test.pl +++ b/t/t9700/test.pl @@ -118,7 +118,7 @@ unlink $tmpfile; # 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?$//; } |