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

1 files changed, 9 insertions, 9 deletions

diff --git a/t/t3020-ls-files-error-unmatch.sh b/t/t3020-ls-files-error-unmatch.sh
index d55559e553..f4066cbc09 100755
--- a/t/t3020-ls-files-error-unmatch.sh
+++ b/t/t3020-ls-files-error-unmatch.sh
@@ -3,25 +3,25 @@
 # Copyright (c) 2006 Carl D. Worth
 #
 
-test_description='git-ls-files test for --error-unmatch option
+test_description='git ls-files test for --error-unmatch option
 
-This test runs git-ls-files --error-unmatch to ensure it correctly
+This test runs git ls-files --error-unmatch to ensure it correctly
 returns an error when a non-existent path is provided on the command
 line.
 '
 . ./test-lib.sh
 
 touch foo bar
-git-update-index --add foo bar
-git-commit -m "add foo bar"
+git update-index --add foo bar
+git commit -m "add foo bar"
 
-test_expect_failure \
-    'git-ls-files --error-unmatch should fail with unmatched path.' \
-    'git-ls-files --error-unmatch foo bar-does-not-match'
+test_expect_success \
+    'git ls-files --error-unmatch should fail with unmatched path.' \
+    'test_must_fail git ls-files --error-unmatch foo bar-does-not-match'
 
 test_expect_success \
-    'git-ls-files --error-unmatch should succeed eith matched paths.' \
-    'git-ls-files --error-unmatch foo bar'
+    'git ls-files --error-unmatch should succeed eith matched paths.' \
+    'git ls-files --error-unmatch foo bar'
 
 test_done
 1