diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-04-19 22:41:30 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-04-19 22:41:30 -0700 |
| commit | ddd02b70f0d80fc3cac6b2f2c42005560d572413 (patch) | |
| tree | 0bd6765c742b6622b6d81587b6ddd98d5062e9eb /t | |
| parent | Git 1.7.1-rc2 (diff) | |
| parent | t7012: Mark missing tests as TODO (diff) | |
| download | tgif-ddd02b70f0d80fc3cac6b2f2c42005560d572413.tar.xz | |
Merge branch 'maint'
* maint:
t7012: Mark missing tests as TODO
reflog: remove 'show' from 'expire's usage string
MSVC: Fix build by adding missing termios.h dummy
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7012-skip-worktree-writing.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/t/t7012-skip-worktree-writing.sh b/t/t7012-skip-worktree-writing.sh index 8d8b1c0e25..582d0b54f1 100755 --- a/t/t7012-skip-worktree-writing.sh +++ b/t/t7012-skip-worktree-writing.sh @@ -136,11 +136,11 @@ test_expect_success 'git-clean, dirty case' ' test_cmp expected result ' -test_expect_failure 'git-apply adds file' false -test_expect_failure 'git-apply updates file' false -test_expect_failure 'git-apply removes file' false -test_expect_failure 'git-mv to skip-worktree' false -test_expect_failure 'git-mv from skip-worktree' false -test_expect_failure 'git-checkout' false +#TODO test_expect_failure 'git-apply adds file' false +#TODO test_expect_failure 'git-apply updates file' false +#TODO test_expect_failure 'git-apply removes file' false +#TODO test_expect_failure 'git-mv to skip-worktree' false +#TODO test_expect_failure 'git-mv from skip-worktree' false +#TODO test_expect_failure 'git-checkout' false test_done |