From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 31 Jan 2010 00:03:10 +0000 (-0800)
Subject: Merge commit 'b319ef7' into jc/maint-fix-test-perm
X-Git-Tag: v1.7.0.2~20^2~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=00d3278c8534a8244ae3447189401111e017fd5d;p=git.git

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
  ...
---

00d3278c8534a8244ae3447189401111e017fd5d
diff --cc t/t6000lib.sh
index 4f72a3d89,f55627b64..985d517a1
mode 100644,100755..100644
--- a/t/t6000lib.sh
+++ b/t/t6000lib.sh