| Message ID | 20190425155118.7918-2-newren@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Fix and extend encoding handling in fast export/import | expand |
On Thu, Apr 25, 2019 at 11:51 AM Elijah Newren <newren@gmail.com> wrote: > This test used an author with non-ascii characters in the name, but > no special commit message. It then grep'ed for those non-ascii > characters, but those are guaranteed to exist regardless of the > reencoding process since the reencoding only affects the commit message, > not the author or committer names. As such, the test would work even if > the re-encoding process simply stripped the commit message entirely. > Modify the test to actually check that the reencoding in utf-8 worked. > > Signed-off-by: Elijah Newren <newren@gmail.com> > --- > diff --git a/t/t9350-fast-export.sh b/t/t9350-fast-export.sh > @@ -94,22 +94,22 @@ test_expect_success 'fast-export --show-original-ids | git fast-import' ' > +test_expect_success 'iso-8859-7' ' > + test_when_finished "git config --unset i18n.commitencoding" && > + git config i18n.commitencoding iso-8859-7 && Aren't these two lines are pretty much equivalent to this single line? test_config i18n.commitencoding iso-8859-7 &&
Eric Sunshine <sunshine@sunshineco.com> writes: > On Thu, Apr 25, 2019 at 11:51 AM Elijah Newren <newren@gmail.com> wrote: >> This test used an author with non-ascii characters in the name, but >> no special commit message. It then grep'ed for those non-ascii >> characters, but those are guaranteed to exist regardless of the >> reencoding process since the reencoding only affects the commit message, >> not the author or committer names. As such, the test would work even if >> the re-encoding process simply stripped the commit message entirely. >> Modify the test to actually check that the reencoding in utf-8 worked. >> >> Signed-off-by: Elijah Newren <newren@gmail.com> >> --- >> diff --git a/t/t9350-fast-export.sh b/t/t9350-fast-export.sh >> @@ -94,22 +94,22 @@ test_expect_success 'fast-export --show-original-ids | git fast-import' ' >> +test_expect_success 'iso-8859-7' ' >> + test_when_finished "git config --unset i18n.commitencoding" && >> + git config i18n.commitencoding iso-8859-7 && > > Aren't these two lines are pretty much equivalent to this single line? > > test_config i18n.commitencoding iso-8859-7 && Yes.
diff --git a/t/t9350-fast-export.sh b/t/t9350-fast-export.sh index 5690fe2810..6c07f910eb 100755 --- a/t/t9350-fast-export.sh +++ b/t/t9350-fast-export.sh @@ -94,22 +94,22 @@ test_expect_success 'fast-export --show-original-ids | git fast-import' ' test $MUSS = $(git rev-parse --verify refs/tags/muss) ' -test_expect_success 'iso-8859-1' ' +test_expect_success 'iso-8859-7' ' - git config i18n.commitencoding ISO8859-1 && - # use author and committer name in ISO-8859-1 to match it. - . "$TEST_DIRECTORY"/t3901/8859-1.txt && + test_when_finished "git reset --hard HEAD~1" && + test_when_finished "git config --unset i18n.commitencoding" && + git config i18n.commitencoding iso-8859-7 && test_tick && echo rosten >file && - git commit -s -m den file && - git fast-export wer^..wer >iso8859-1.fi && - sed "s/wer/i18n/" iso8859-1.fi | + git commit -s -m "$(printf "Pi: \360")" file && + git fast-export wer^..wer >iso-8859-7.fi && + sed "s/wer/i18n/" iso-8859-7.fi | (cd new && git fast-import && git cat-file commit i18n >actual && - grep "Áéí óú" actual) - + grep $(printf "\317\200") actual) ' + test_expect_success 'import/export-marks' ' git checkout -b marks master && @@ -224,7 +224,6 @@ GIT_COMMITTER_NAME='C O Mitter'; export GIT_COMMITTER_NAME test_expect_success 'setup copies' ' - git config --unset i18n.commitencoding && git checkout -b copy rein && git mv file file3 && git commit -m move1 &&
This test used an author with non-ascii characters in the name, but no special commit message. It then grep'ed for those non-ascii characters, but those are guaranteed to exist regardless of the reencoding process since the reencoding only affects the commit message, not the author or committer names. As such, the test would work even if the re-encoding process simply stripped the commit message entirely. Modify the test to actually check that the reencoding in utf-8 worked. Signed-off-by: Elijah Newren <newren@gmail.com> --- t/t9350-fast-export.sh | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-)