Alexey Shumkin <alex.crezoff@xxxxxxxxx> writes: > diff --git a/t/t6006-rev-list-format.sh b/t/t6006-rev-list-format.sh > index c248509..4db43a4 100755 > --- a/t/t6006-rev-list-format.sh > +++ b/t/t6006-rev-list-format.sh > ... > @@ -112,12 +133,12 @@ commit $head2 > commit $head1 > EOF > > -test_format raw-body %B <<'EOF' > -commit 131a310eb913d107dd3c09a65d1651175898735d > -changed foo > +test_format failure raw-body %B <<EOF > +commit $head2 > +$changed > > -commit 86c75cfd708a0e5868dc876ed5b8bb66c80b4873 > -added foo > +commit $head1 > +$added > > EOF It may have been easier to follow if you did this "Don't hardcode" as a separate preparatory patch, like your first two patches. > @@ -135,16 +156,16 @@ commit $head1 > foo > EOF > > -cat >commit-msg <<'EOF' > +iconv -f utf-8 -t cp1251 > commit-msg <<EOF > Test printing of complex bodies > > This commit message is much longer than the others, > -and it will be encoded in iso8859-1. We should therefore > -include an iso8859 character: ¡bueno! > +and it will be encoded in cp1251. We should therefore > +include an cp1251 character: так вот! > EOF > > test_expect_success 'setup complex body' ' > - git config i18n.commitencoding iso8859-1 && > + git config i18n.commitencoding cp1251 && What is going on here? Is this an example that shows that i18n.commitencoding works correctly with iso8859-1 but not with cp1251? > diff --git a/t/t7102-reset.sh b/t/t7102-reset.sh > index cf492f4..699c824 100755 > --- a/t/t7102-reset.sh > +++ b/t/t7102-reset.sh > ... > @@ -192,7 +214,7 @@ test_expect_success \ > 'changing files and redo the last commit should succeed' ' > echo "3rd line 2nd file" >>secondfile && > git commit -a -C ORIG_HEAD && > - check_changes 3d3b7be011a58ca0c179ae45d94e6c83c0b0cd0d && > + check_changes f06f78b8dd468c722952b77569dd0db212442c25 && > test "$(git rev-parse ORIG_HEAD)" = \ > $head5 > ' This and remaining hunks to this script shows that it would be helped by the same love you gave to other scripts with your first two patches before you add the "non-unicode" tests, no? -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html