diff --git a/tests/latin-1-encoding b/tests/latin-1-encoding index fbbdbc8a87853b4bf2f179257f7268371ac73bec_dGVzdHMvbGF0aW4tMS1lbmNvZGluZw==..24d4741674a651ea63007b1179829905fc130624_dGVzdHMvbGF0aW4tMS1lbmNvZGluZw== 100644 --- a/tests/latin-1-encoding +++ b/tests/latin-1-encoding @@ -5,7 +5,7 @@ GIT_AUTHOR_NAME='tést èncödîng'; export GIT_AUTHOR_NAME echo beta > beta git add beta -commit -m 'add beta' +fn_git_commit -m 'add beta' echo gamma > gamma git add gamma @@ -9,9 +9,9 @@ echo gamma > gamma git add gamma -commit -m 'add gämmâ' +fn_git_commit -m 'add gämmâ' # test the commit encoding field git config i18n.commitencoding latin-1 echo delta > delta git add delta @@ -13,6 +13,6 @@ # test the commit encoding field git config i18n.commitencoding latin-1 echo delta > delta git add delta -commit -m 'add déltà' +fn_git_commit -m 'add déltà' diff --git a/tests/test-encoding.t b/tests/test-encoding.t index fbbdbc8a87853b4bf2f179257f7268371ac73bec_dGVzdHMvdGVzdC1lbmNvZGluZy50..24d4741674a651ea63007b1179829905fc130624_dGVzdHMvdGVzdC1lbmNvZGluZy50 100644 --- a/tests/test-encoding.t +++ b/tests/test-encoding.t @@ -3,22 +3,6 @@ Load commonly used test logic $ . "$TESTDIR/testutil" - $ GIT_AUTHOR_NAME='test'; export GIT_AUTHOR_NAME - $ GIT_AUTHOR_EMAIL='test@example.org'; export GIT_AUTHOR_EMAIL - $ GIT_AUTHOR_DATE="2007-01-01 00:00:00 +0000"; export GIT_AUTHOR_DATE - $ GIT_COMMITTER_NAME="$GIT_AUTHOR_NAME"; export GIT_COMMITTER_NAME - $ GIT_COMMITTER_EMAIL="$GIT_AUTHOR_EMAIL"; export GIT_COMMITTER_EMAIL - $ GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"; export GIT_COMMITTER_DATE - - $ count=10 - $ commit() - > { - > GIT_AUTHOR_DATE="2007-01-01 00:00:$count +0000" - > GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE" - > git commit "$@" >/dev/null || echo "git commit error" - > count=`expr $count + 1` - > } - $ git init gitrepo Initialized empty Git repository in $TESTTMP/gitrepo/.git/ $ cd gitrepo @@ -26,7 +10,7 @@ utf-8 encoded commit message $ echo alpha > alpha $ git add alpha - $ commit -m 'add älphà ' + $ fn_git_commit -m 'add älphà ' Create some commits using latin1 encoding The warning message changed in Git 1.8.0 diff --git a/tests/testutil b/tests/testutil index fbbdbc8a87853b4bf2f179257f7268371ac73bec_dGVzdHMvdGVzdHV0aWw=..24d4741674a651ea63007b1179829905fc130624_dGVzdHMvdGVzdHV0aWw= 100755 --- a/tests/testutil +++ b/tests/testutil @@ -33,9 +33,9 @@ fn_git_commit() { GIT_AUTHOR_DATE="2007-01-01 00:00:$count +0000" GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE" - git commit "$@" >/dev/null 2>/dev/null || echo "git commit error" + git commit "$@" >/dev/null || echo "git commit error" count=`expr $count + 1` } fn_hg_commit() { HGDATE="2007-01-01 00:00:$count +0000" @@ -37,12 +37,12 @@ count=`expr $count + 1` } fn_hg_commit() { HGDATE="2007-01-01 00:00:$count +0000" - hg commit -d "$HGDATE" "$@" >/dev/null 2>/dev/null || echo "hg commit error" + hg commit -d "$HGDATE" "$@" >/dev/null || echo "hg commit error" count=`expr $count + 1` } fn_git_tag() { GIT_AUTHOR_DATE="2007-01-01 00:00:$count +0000" GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE" @@ -43,12 +43,12 @@ count=`expr $count + 1` } fn_git_tag() { GIT_AUTHOR_DATE="2007-01-01 00:00:$count +0000" GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE" - git tag "$@" >/dev/null 2>/dev/null || echo "git tag error" + git tag "$@" >/dev/null || echo "git tag error" count=`expr $count + 1` } fn_hg_tag() { HGDATE="2007-01-01 00:00:$count +0000" @@ -50,8 +50,8 @@ count=`expr $count + 1` } fn_hg_tag() { HGDATE="2007-01-01 00:00:$count +0000" - hg tag -d "$HGDATE" "$@" >/dev/null 2>/dev/null || echo "hg tag error" + hg tag -d "$HGDATE" "$@" >/dev/null || echo "hg tag error" count=`expr $count + 1` }