Merge branch 'jk/pull-into-dirty-unborn' into maint

diff --git a/contrib/remote-helpers/test-hg-bidi.sh b/contrib/remote-helpers/test-hg-bidi.sh
index f36895311ea6b0dc8206498cad4aef94c822c83f..f5696977342fc91f85a6d8b564677e6ace8a78d0 100755 (executable)
--- a/contrib/remote-helpers/test-hg-bidi.sh
+++ b/contrib/remote-helpers/test-hg-bidi.sh
@@ -68,10 +68,10 @@ setup () {
        ) >> "$HOME"/.hgrc &&
        git config --global remote-hg.hg-git-compat true
 
-       export HGEDITOR=/usr/bin/true
-
-       export GIT_AUTHOR_DATE="2007-01-01 00:00:00 +0230"
-       export GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"
+       HGEDITOR=/usr/bin/true
+       GIT_AUTHOR_DATE="2007-01-01 00:00:00 +0230"
+       GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"
+       export HGEDITOR GIT_AUTHOR_DATE GIT_COMMITTER_DATE
 }
 
 setup
@@ -88,7 +88,8 @@ test_expect_success 'encoding' '
        git add alpha &&
        git commit -m "add älphà" &&
 
-       export GIT_AUTHOR_NAME="tést èncödîng" &&
+       GIT_AUTHOR_NAME="tést èncödîng" &&
+       export GIT_AUTHOR_NAME &&
        echo beta > beta &&
        git add beta &&
        git commit -m "add beta" &&