mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-24 02:17:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* maint:
  t7012: Mark missing tests as TODO
  reflog: remove 'show' from 'expire's usage string
  MSVC: Fix build by adding missing termios.h dummy
This commit is contained in:
Junio C Hamano 2010-04-19 22:41:30 -07:00
commit ddd02b70f0
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/reflog.c
View File

@ -13,7 +13,7 @@
*/
static const char reflog_expire_usage[] =
"git reflog (show|expire) [--verbose] [--dry-run] [--stale-fix] [--expire=<time>] [--expire-unreachable=<time>] [--all] <refs>...";
"git reflog expire [--verbose] [--dry-run] [--stale-fix] [--expire=<time>] [--expire-unreachable=<time>] [--all] <refs>...";
static const char reflog_delete_usage[] =
"git reflog delete [--verbose] [--dry-run] [--rewrite] [--updateref] <refs>...";

1
compat/vcbuild/include/termios.h Normal file
View File

@ -0,0 +1 @@
/* Intentionally empty file to support building git with MSVC */

12
t/t7012-skip-worktree-writing.sh
View File

@ -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