From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 26 Aug 2015 22:45:35 +0000 (-0700)
Subject: Merge branch 'sg/t3020-typofix'
X-Git-Tag: v2.6.0-rc0~34
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/7205e220e88c77c645c9fa835bc4bc878e411191

Merge branch 'sg/t3020-typofix'

* sg/t3020-typofix:
t3020: fix typo in test description
---

7205e220e88c77c645c9fa835bc4bc878e411191
diff --cc t/t3020-ls-files-error-unmatch.sh
index ca01053bcc,19008090d2..124e73b8e6
--- a/t/t3020-ls-files-error-unmatch.sh
+++ b/t/t3020-ls-files-error-unmatch.sh
@@@ -11,18 -11,16 +11,18 @@@ line
  '
  . ./test-lib.sh
  
 -touch foo bar
 -git update-index --add foo bar
 -git-commit -m "add foo bar"
 +test_expect_success 'setup' '
 +	touch foo bar &&
 +	git update-index --add foo bar &&
 +	git commit -m "add foo bar"
 +'
  
 -test_expect_failure \
 +test_expect_success \
      'git ls-files --error-unmatch should fail with unmatched path.' \
 -    'git ls-files --error-unmatch foo bar-does-not-match'
 +    '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 should succeed with matched paths.' \
      'git ls-files --error-unmatch foo bar'
  
  test_done