This repository was archived by the owner on Nov 9, 2017. It is now read-only.
File tree Expand file tree Collapse file tree 4 files changed +13
-7
lines changed Expand file tree Collapse file tree 4 files changed +13
-7
lines changed Original file line number Diff line number Diff line change @@ -23,8 +23,10 @@ add_file () {
23
23
echo " $name " > " $name " &&
24
24
git add " $name " &&
25
25
test_tick &&
26
- msg_added_iso88591=$( echo " Add $name ($added $name )" | iconv -f utf-8 -t iso8859-1) &&
27
- git -c ' i18n.commitEncoding=iso8859-1' commit -m " $msg_added_iso88591 "
26
+ # "git commit -m" would break MinGW, as Windows refuse to pass
27
+ # iso8859-1 encoded parameter to git.
28
+ echo " Add $name ($added $name )" | iconv -f utf-8 -t iso8859-1 |
29
+ git -c ' i18n.commitEncoding=iso8859-1' commit -F -
28
30
done > /dev/null &&
29
31
git rev-parse --short --verify HEAD
30
32
)
Original file line number Diff line number Diff line change @@ -28,7 +28,7 @@ test_expect_success 'set up basic repos' '
28
28
git add foo &&
29
29
test_tick &&
30
30
git config i18n.commitEncoding iso8859-1 &&
31
- git commit -m "$(commit_msg iso8859-1)" &&
31
+ commit_msg iso8859-1 | git commit -F - &&
32
32
git add bar &&
33
33
test_tick &&
34
34
git commit -m "add bar" &&
Original file line number Diff line number Diff line change @@ -22,13 +22,13 @@ test_expect_success 'setup' '
22
22
: >foo &&
23
23
git add foo &&
24
24
git config i18n.commitEncoding iso8859-1 &&
25
- git commit -m "$added_iso88591" &&
25
+ echo "$added_iso88591" | git commit -F - &&
26
26
head1=$(git rev-parse --verify HEAD) &&
27
27
head1_short=$(git rev-parse --verify --short $head1) &&
28
28
tree1=$(git rev-parse --verify HEAD:) &&
29
29
tree1_short=$(git rev-parse --verify --short $tree1) &&
30
30
echo "$changed" > foo &&
31
- git commit -a -m "$changed_iso88591" &&
31
+ echo "$changed_iso88591" | git commit -a -F - &&
32
32
head2=$(git rev-parse --verify HEAD) &&
33
33
head2_short=$(git rev-parse --verify --short $head2) &&
34
34
tree2=$(git rev-parse --verify HEAD:) &&
Original file line number Diff line number Diff line change @@ -41,7 +41,9 @@ test_expect_success 'creating initial files and commits' '
41
41
42
42
echo "1st line 2nd file" >secondfile &&
43
43
echo "2nd line 2nd file" >>secondfile &&
44
- git -c "i18n.commitEncoding=iso8859-1" commit -a -m "$(commit_msg iso8859-1)" &&
44
+ # "git commit -m" would break MinGW, as Windows refuse to pass
45
+ # iso8859-1 encoded parameter to git.
46
+ commit_msg iso8859-1 | git -c "i18n.commitEncoding=iso8859-1" commit -a -F - &&
45
47
head5=$(git rev-parse --verify HEAD)
46
48
'
47
49
# git log --pretty=oneline # to see those SHA1 involved
@@ -331,7 +333,9 @@ test_expect_success 'redoing the last two commits should succeed' '
331
333
332
334
echo "1st line 2nd file" >secondfile &&
333
335
echo "2nd line 2nd file" >>secondfile &&
334
- git -c "i18n.commitEncoding=iso8859-1" commit -a -m "$(commit_msg iso8859-1)" &&
336
+ # "git commit -m" would break MinGW, as Windows refuse to pass
337
+ # iso8859-1 encoded parameter to git.
338
+ commit_msg iso8859-1 | git -c "i18n.commitEncoding=iso8859-1" commit -a -F - &&
335
339
check_changes $head5
336
340
'
337
341
You can’t perform that action at this time.
0 commit comments