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 cygwinmaint
commit
cd8b8cba47
|
|
@ -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
|
||||
)
|
||||
|
|
|
|||
|
|
@ -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?$//;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue