diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-06-30 22:45:43 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-30 22:45:43 (GMT) |
| commit | 7a3187eb788854ed3a20fee30b27e68430f753b7 (patch) | |
| tree | d31d59f4994233e39e1b3ff4ea58fac5aa5c4fb3 /t | |
| parent | c1182d9297c2486d36bf7a49a31bb3d7c2f98a9b (diff) | |
| parent | 43d11f4492ebafdabd3fb0c9bcab49d2731e4676 (diff) | |
| download | git-7a3187eb788854ed3a20fee30b27e68430f753b7.zip git-7a3187eb788854ed3a20fee30b27e68430f753b7.tar.gz git-7a3187eb788854ed3a20fee30b27e68430f753b7.tar.bz2 | |
Merge branch 'maint'
* maint:
Start preparing for 1.8.3.3
check-ignore doc: fix broken link to ls-files page
test: spell 'ls-files --delete' option correctly in test descriptions
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7011-skip-worktree-reading.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t7011-skip-worktree-reading.sh b/t/t7011-skip-worktree-reading.sh index 8f3b54d..88d60c1 100755 --- a/t/t7011-skip-worktree-reading.sh +++ b/t/t7011-skip-worktree-reading.sh @@ -91,12 +91,12 @@ test_expect_success 'update-index --remove' ' test_cmp expected 1 ' -test_expect_success 'ls-files --delete' ' +test_expect_success 'ls-files --deleted' ' setup_absent && test -z "$(git ls-files -d)" ' -test_expect_success 'ls-files --delete' ' +test_expect_success 'ls-files --deleted' ' setup_dirty && test -z "$(git ls-files -d)" ' |