Merge branch 'rs/worktree-list-show-locked'

gitster · gitster · commit 3fc24194c2de · 2020-11-11T13:18:38.000-08:00
Typofix.

* rs/worktree-list-show-locked:
  t2402: fix typo
diff --git a/t/t2402-worktree-list.sh b/t/t2402-worktree-list.sh
@@ -61,7 +61,7 @@ test_expect_success '"list" all worktrees --porcelain' '
 	test_cmp expect actual
 '
 
-test_expect_success '"list" all worktress with locked annotation' '
+test_expect_success '"list" all worktrees with locked annotation' '
 	test_when_finished "rm -rf locked unlocked out && git worktree prune" &&
 	git worktree add --detach locked master &&
 	git worktree add --detach unlocked master &&

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ test_expect_success '"list" all worktrees --porcelain' '`
`61`	`61`	`test_cmp expect actual`
`62`	`62`	`'`
`63`	`63`
`64`		`-test_expect_success '"list" all worktress with locked annotation' '`
	`64`	`+test_expect_success '"list" all worktrees with locked annotation' '`
`65`	`65`	`test_when_finished "rm -rf locked unlocked out && git worktree prune" &&`
`66`	`66`	`git worktree add --detach locked master &&`
`67`	`67`	`git worktree add --detach unlocked master &&`