Merge branch 'sb/t9300-typofix'

gitster · gitster · commit 4d4dc66df0da · 2014-09-29T12:36:13.000-07:00
* sb/t9300-typofix:
  t9300-fast-import: fix typo in test description
diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh
@@ -2866,7 +2866,7 @@ test_expect_success 'S: notemodify with garbage after sha1 dataref must fail' '
 #
 # notemodify, mark in commit-ish
 #
-test_expect_success 'S: notemodify with garbarge after mark commit-ish must fail' '
+test_expect_success 'S: notemodify with garbage after mark commit-ish must fail' '
 	test_must_fail git fast-import --import-marks=marks <<-EOF 2>err &&
 	commit refs/heads/Snotes
 	committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE

Original file line number	Diff line number	Diff line change
`@@ -2866,7 +2866,7 @@ test_expect_success 'S: notemodify with garbage after sha1 dataref must fail' '`
`2866`	`2866`	`#`
`2867`	`2867`	`# notemodify, mark in commit-ish`
`2868`	`2868`	`#`
`2869`		`-test_expect_success 'S: notemodify with garbarge after mark commit-ish must fail' '`
	`2869`	`+test_expect_success 'S: notemodify with garbage after mark commit-ish must fail' '`
`2870`	`2870`	`test_must_fail git fast-import --import-marks=marks <<-EOF 2>err &&`
`2871`	`2871`	`commit refs/heads/Snotes`
`2872`	`2872`	`committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE`