Merge commit 'b319ef7' into jc/maint-fix-test-perm

* commit 'b319ef7': (8132 commits)
Add a small patch-mode testing library
git-apply--interactive: Refactor patch mode code
t8005: Nobody writes Russian in shift_jis
Fix severe breakage in "git-apply --whitespace=fix"
Update release notes for 1.6.4
After renaming a section, print any trailing variable definitions
Make section_name_match start on '[', and return the length on success
send-email: detect cycles in alias expansion
Show the presence of untracked files in the bash prompt.
SunOS grep does not understand -C<n> nor -e
Fix export_marks() error handling.
git repack: keep commits hidden by a graft
Add a test showing that 'git repack' throws away grafted-away parents
git branch: clean up detached branch handling
git branch: avoid unnecessary object lookups
git branch: fix performance problem
git svn: fix shallow clone when upstream revision is too new
do_one_ref(): null_sha1 check is not about broken ref
configure.ac: properly unset NEEDS_SSL_WITH_CRYPTO when sha1 func is missing
janitor: useless checks before free
...

diff --combined t/t6000lib.sh
index 4f72a3d890141f44aaddcdb8d978b3ca4ceeab96,f55627b641682e72d58a2282639ca589b38fa744..985d517a1ce4cf2f80eed3d54c25b5fc912d5c6b
mode 100644,100755..100644
--- 1/t/t6000lib.sh
--- 2/t/t6000lib.sh
+++ b/t/t6000lib.sh
@@@ -1,5 -1,3 +1,5 @@@
 +: included from 6002 and others
 +
  [ -d .git/refs/tags ] || mkdir -p .git/refs/tags
  
  :> sed.script
@@@ -19,17 -17,17 +19,17 @@@ 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
  # a substitution script for the tag onto the front of sed.script
  save_tag()
  {
-       _tag=$1 
+       _tag=$1
        [ -n "$_tag" ] || error "usage: save_tag tag commit-args ..."
        shift 1
-       "$@" >.git/refs/tags/$_tag
+       "$@" >.git/refs/tags/$_tag
  
          echo "s/$(tag $_tag)/$_tag/g" > sed.script.tmp
        cat sed.script >> sed.script.tmp
@@@ -37,7 -35,7 +37,7 @@@
        mv sed.script.tmp sed.script
  }
  
- # Replace unhelpful sha1 hashses with their symbolic equivalents 
+ # Replace unhelpful sha1 hashses with their symbolic equivalents
  entag()
  {
        sed -f sed.script
@@@ -51,27 -49,30 +51,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
  }
@@@ -99,20 -100,26 +102,26 @@@ 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/;
+       '
  }
  
  
  # Execute the test described by the first argument, by eval'ing
  # command line specified in the 2nd argument. Check the status code
- # is zero and that the output matches the stream read from 
+ # is zero and that the output matches the stream read from
  # stdin.
  test_output_expect_success()
- {     
+ {
        _description=$1
          _test=$2
          [ $# -eq 2 ] || error "usage: test_output_expect_success description test <<EOF ... EOF"
          _name=$(echo $_description | name_from_description)
        cat > $_name.expected
-       test_expect_success "$_description" "check_output $_name \"$_test\"" 
+       test_expect_success "$_description" "check_output $_name \"$_test\""
  }