Commit 3d78ab64272ab56fc449f50bbd970d64801aa8bd
2012-07-06T19:48:57
revparse: split reflog test per feature
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45
diff --git a/tests-clar/refs/revparse.c b/tests-clar/refs/revparse.c
index b23ce67..3f4fcd6 100644
--- a/tests-clar/refs/revparse.c
+++ b/tests-clar/refs/revparse.c
@@ -149,22 +149,32 @@ void test_refs_revparse__upstream(void)
test_object("refs/heads/master@{u}", "be3563ae3f795b2b4353bcce3a527ad0a4f7f644");
}
-void test_refs_revparse__reflog(void)
+void test_refs_revparse__ordinal(void)
{
- cl_git_fail(git_revparse_single(&g_obj, g_repo, "@{-xyz}"));
- cl_git_fail(git_revparse_single(&g_obj, g_repo, "@{-0}"));
cl_git_fail(git_revparse_single(&g_obj, g_repo, "master@{-2}"));
- cl_git_fail(git_revparse_single(&g_obj, g_repo, "@{1000}"));
test_object("nope@{0}", NULL);
test_object("master@{31415}", NULL);
+ test_object("@{1000}", NULL);
- test_object("@{-2}", "a65fedf39aefe402d3bb6e24df4d4f5fe4547750");
- test_object("@{-1}", "a4a7dce85cf63874e984719f4fdd239f5145052f");
- test_object("master@{0}", "a65fedf39aefe402d3bb6e24df4d4f5fe4547750");
- test_object("master@{1}", "be3563ae3f795b2b4353bcce3a527ad0a4f7f644");
test_object("@{0}", "a65fedf39aefe402d3bb6e24df4d4f5fe4547750");
test_object("@{1}", "be3563ae3f795b2b4353bcce3a527ad0a4f7f644");
+
+ test_object("master@{0}", "a65fedf39aefe402d3bb6e24df4d4f5fe4547750");
+ test_object("master@{1}", "be3563ae3f795b2b4353bcce3a527ad0a4f7f644");
+ test_object("heads/master@{1}", "be3563ae3f795b2b4353bcce3a527ad0a4f7f644");
+ test_object("refs/heads/master@{1}", "be3563ae3f795b2b4353bcce3a527ad0a4f7f644");
+}
+
+void test_refs_revparse__previous_head(void)
+{
+ cl_git_fail(git_revparse_single(&g_obj, g_repo, "@{-xyz}"));
+ cl_git_fail(git_revparse_single(&g_obj, g_repo, "@{-0}"));
+
+ test_object("@{-42}", NULL);
+
+ test_object("@{-2}", "a65fedf39aefe402d3bb6e24df4d4f5fe4547750");
+ test_object("@{-1}", "a4a7dce85cf63874e984719f4fdd239f5145052f");
}
static void create_fake_stash_reference_and_reflog(git_repository *repo)