summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-04-20 05:41:30 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-04-20 05:41:30 (GMT)
commitddd02b70f0d80fc3cac6b2f2c42005560d572413 (patch)
tree0bd6765c742b6622b6d81587b6ddd98d5062e9eb
parent5469e2dab133a197dc2ca2fa47eb9e846ac19b66 (diff)
parent3d8167677ddd71405906409994a72306ba993a1f (diff)
downloadgit-ddd02b70f0d80fc3cac6b2f2c42005560d572413.zip
git-ddd02b70f0d80fc3cac6b2f2c42005560d572413.tar.gz
git-ddd02b70f0d80fc3cac6b2f2c42005560d572413.tar.bz2
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
-rw-r--r--builtin/reflog.c2
-rw-r--r--compat/vcbuild/include/termios.h1
-rwxr-xr-xt/t7012-skip-worktree-writing.sh12
3 files changed, 8 insertions, 7 deletions
diff --git a/builtin/reflog.c b/builtin/reflog.c
index 64e45bd..bd7880d 100644
--- a/builtin/reflog.c
+++ b/builtin/reflog.c
@@ -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>...";
diff --git a/compat/vcbuild/include/termios.h b/compat/vcbuild/include/termios.h
new file mode 100644
index 0000000..0d8552a
--- /dev/null
+++ b/compat/vcbuild/include/termios.h
@@ -0,0 +1 @@
+/* Intentionally empty file to support building git with MSVC */
diff --git a/t/t7012-skip-worktree-writing.sh b/t/t7012-skip-worktree-writing.sh
index 8d8b1c0..582d0b5 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