]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'sg/t3020-typofix' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 4 Sep 2015 02:17:54 +0000 (19:17 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 4 Sep 2015 02:17:55 +0000 (19:17 -0700)
* sg/t3020-typofix:
  t3020: fix typo in test description

1  2 
t/t3020-ls-files-error-unmatch.sh

index ca01053bcc88806aae9abde5892b8c163b3936d0,19008090d2d82ec2267d1afa91f8cc86d4a33ce1..124e73b8e601ed3c714fe2857d2b227ee04e2ffc
@@@ -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