Skip to content

Commit 199faa1

Browse files
committed
Merge 'win-tests-fixes' into HEAD
2 parents 81dccd1 + 802f7da commit 199faa1

File tree

5 files changed

+24
-7
lines changed

5 files changed

+24
-7
lines changed

t/t0027-auto-crlf.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ test_description='CRLF conversion all combinations'
44

55
. ./test-lib.sh
66

7-
if ! test_have_prereq EXPENSIVE
7+
if ! test_have_prereq EXPENSIVE && ! test_have_prereq MINGW
88
then
9-
skip_all="EXPENSIVE not set"
9+
skip_all="Neither EXPENSIVE nor MINGW set"
1010
test_done
1111
fi
1212

t/t0302-credential-store.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ helper_test store
3737
unset XDG_CONFIG_HOME
3838

3939
test_expect_success 'if custom xdg file exists, home and xdg files not created' '
40-
test_when_finished "rm -f $HOME/xdg/git/credentials" &&
40+
test_when_finished "rm -f \"$HOME/xdg/git/credentials\"" &&
4141
test -s "$HOME/xdg/git/credentials" &&
4242
test_path_is_missing "$HOME/.git-credentials" &&
4343
test_path_is_missing "$HOME/.config/git/credentials"

t/t3900-i18n-commit.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ test_expect_success 'UTF-16 refused because of NULs' '
4040
'
4141

4242
test_expect_success 'UTF-8 invalid characters refused' '
43-
test_when_finished "rm -f $HOME/stderr $HOME/invalid" &&
43+
test_when_finished "rm -f \"$HOME/stderr $HOME/invalid\"" &&
4444
echo "UTF-8 characters" >F &&
4545
printf "Commit message\n\nInvalid surrogate:\355\240\200\n" \
4646
>"$HOME/invalid" &&
@@ -49,7 +49,7 @@ test_expect_success 'UTF-8 invalid characters refused' '
4949
'
5050

5151
test_expect_success 'UTF-8 overlong sequences rejected' '
52-
test_when_finished "rm -f $HOME/stderr $HOME/invalid" &&
52+
test_when_finished "rm -f \"$HOME/stderr $HOME/invalid\"" &&
5353
rm -f "$HOME/stderr" "$HOME/invalid" &&
5454
echo "UTF-8 overlong" >F &&
5555
printf "\340\202\251ommit message\n\nThis is not a space:\300\240\n" \
@@ -59,7 +59,7 @@ test_expect_success 'UTF-8 overlong sequences rejected' '
5959
'
6060

6161
test_expect_success 'UTF-8 non-characters refused' '
62-
test_when_finished "rm -f $HOME/stderr $HOME/invalid" &&
62+
test_when_finished "rm -f \"$HOME/stderr $HOME/invalid\"" &&
6363
echo "UTF-8 non-character 1" >F &&
6464
printf "Commit message\n\nNon-character:\364\217\277\276\n" \
6565
>"$HOME/invalid" &&
@@ -68,7 +68,7 @@ test_expect_success 'UTF-8 non-characters refused' '
6868
'
6969

7070
test_expect_success 'UTF-8 non-characters refused' '
71-
test_when_finished "rm -f $HOME/stderr $HOME/invalid" &&
71+
test_when_finished "rm -f \"$HOME/stderr $HOME/invalid\"" &&
7272
echo "UTF-8 non-character 2." >F &&
7373
printf "Commit message\n\nNon-character:\357\267\220\n" \
7474
>"$HOME/invalid" &&

t/t9020-remote-svn.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,12 @@ then
1212
test_done
1313
fi
1414

15+
if test_have_prereq MINGW
16+
then
17+
skip_all='skipping remote-svn tests for lack of POSIX'
18+
test_done
19+
fi
20+
1521
# Override svnrdump with our simulator
1622
PATH="$HOME:$PATH"
1723
export PATH PYTHON_PATH GIT_BUILD_DIR

t/t9350-fast-export.sh

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -522,4 +522,15 @@ test_expect_success 'delete refspec' '
522522
test_cmp expected actual
523523
'
524524

525+
cat > expected << EOF
526+
reset refs/heads/master
527+
from $(git rev-parse master)
528+
529+
EOF
530+
531+
test_expect_failure 'refs are updated even if no commits need to be exported' '
532+
git fast-export master..master > actual &&
533+
test_cmp expected actual
534+
'
535+
525536
test_done

0 commit comments

Comments
 (0)