Merge git://git2.kernel.org/pub/scm/gitk/gitk into maint

diff --git a/t/t6000lib.sh b/t/t6000lib.sh
index c6752af48e04993e3ed3efebf288ffa86d02633a..d40262159bce36e78dd56d931eaf1d007ef77da8 100755 (executable)
--- a/t/t6000lib.sh
+++ b/t/t6000lib.sh
@@ -69,7 +69,9 @@ on_committer_date()
 {
     _date=$1
     shift 1
-    GIT_COMMITTER_DATE=$_date "$@"
+    export GIT_COMMITTER_DATE="$_date"
+    "$@"
+    unset GIT_COMMITTER_DATE
 }
 
 # Execute a command and suppress any error output.