X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft6000lib.sh;h=f55627b641682e72d58a2282639ca589b38fa744;hb=20bd35c1103930e690362d0342cdc54c5a97e4b1;hp=d548bf8026289f1d590ecd0e0b7ec883650c4d78;hpb=610f043bb378d12f399f4e5692fb874e0a043b23;p=git.git

diff --git a/t/t6000lib.sh b/t/t6000lib.sh
index d548bf802..f55627b64 100755
--- a/t/t6000lib.sh
+++ b/t/t6000lib.sh
@@ -17,7 +17,7 @@ unique_commit()
 	_text=$1
         _tree=$2
 	shift 2
-	echo $_text | git-commit-tree $(tag $_tree) "$@"
+	echo $_text | git commit-tree $(tag $_tree) "$@"
 }
 
 # Save the output of a command into the tag specified. Prepend
@@ -49,27 +49,30 @@ as_author()
 	shift 1
         _save=$GIT_AUTHOR_EMAIL
 
-	export GIT_AUTHOR_EMAIL="$_author"
+	GIT_AUTHOR_EMAIL="$_author"
+	export GIT_AUTHOR_EMAIL
 	"$@"
 	if test -z "$_save"
 	then
 		unset GIT_AUTHOR_EMAIL
 	else
-		export GIT_AUTHOR_EMAIL="$_save"
+		GIT_AUTHOR_EMAIL="$_save"
+		export GIT_AUTHOR_EMAIL
 	fi
 }
 
 commit_date()
 {
         _commit=$1
-	git-cat-file commit $_commit | sed -n "s/^committer .*> \([0-9]*\) .*/\1/p"
+	git cat-file commit $_commit | sed -n "s/^committer .*> \([0-9]*\) .*/\1/p"
 }
 
 on_committer_date()
 {
     _date=$1
     shift 1
-    export GIT_COMMITTER_DATE="$_date"
+    GIT_COMMITTER_DATE="$_date"
+    export GIT_COMMITTER_DATE
     "$@"
     unset GIT_COMMITTER_DATE
 }
@@ -97,7 +100,13 @@ check_output()
 # from front and back.
 name_from_description()
 {
-        tr "'" '-' | tr '~`!@#$%^&*()_+={}[]|\;:"<>,/? ' '-' | tr -s '-' | tr '[A-Z]' '[a-z]' | sed "s/^-*//;s/-*\$//"
+	perl -pe '
+		s/[^A-Za-z0-9.]/-/g;
+		s/-+/-/g;
+		s/-$//;
+		s/^-//;
+		y/A-Z/a-z/;
+	'
 }