Commit a5815a2afb7f6a0e86d52467b99d06d9bf01a9fb
2015-03-07T00:30:40
Add tests for the annotated versions of ref-modifying functions This also brings the soft-reset tests back to life. The function name was missing an underscore, meaning they had not been running.
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 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191
diff --git a/tests/refs/branches/create.c b/tests/refs/branches/create.c
index d4cf4c2..31dec06 100644
--- a/tests/refs/branches/create.c
+++ b/tests/refs/branches/create.c
@@ -97,6 +97,7 @@ void test_refs_branches_create__default_reflog_message(void)
git_reflog *log;
git_buf buf = GIT_BUF_INIT;
const git_reflog_entry *entry;
+ git_annotated_commit *annotated;
git_signature *sig;
git_config *cfg;
@@ -116,6 +117,21 @@ void test_refs_branches_create__default_reflog_message(void)
cl_assert_equal_s(git_buf_cstr(&buf), git_reflog_entry_message(entry));
cl_assert_equal_s(sig->email, git_reflog_entry_committer(entry)->email);
+ cl_git_pass(git_reference_remove(repo, "refs/heads/" NEW_BRANCH_NAME));
+ git_reference_free(branch);
+ git_reflog_free(log);
+ git_buf_clear(&buf);
+
+ cl_git_pass(git_annotated_commit_from_revspec(&annotated, repo, "e90810b8df3"));
+ cl_git_pass(git_branch_create_from_annotated(&branch, repo, NEW_BRANCH_NAME, annotated, true));
+ cl_git_pass(git_reflog_read(&log, repo, "refs/heads/" NEW_BRANCH_NAME));
+
+ entry = git_reflog_entry_byindex(log, 0);
+ cl_git_pass(git_buf_printf(&buf, "branch: Created from e90810b8df3"));
+ cl_assert_equal_s(git_buf_cstr(&buf), git_reflog_entry_message(entry));
+ cl_assert_equal_s(sig->email, git_reflog_entry_committer(entry)->email);
+
+ git_annotated_commit_free(annotated);
git_buf_free(&buf);
git_reflog_free(log);
git_signature_free(sig);
diff --git a/tests/repo/head.c b/tests/repo/head.c
index b26d6ac..31c2287 100644
--- a/tests/repo/head.c
+++ b/tests/repo/head.c
@@ -2,6 +2,7 @@
#include "refs.h"
#include "repo_helpers.h"
#include "posix.h"
+#include "git2/annotated_commit.h"
static const char *g_email = "foo@example.com";
static git_repository *repo;
@@ -251,6 +252,7 @@ void test_repo_head__setting_head_updates_reflog(void)
{
git_object *tag;
git_signature *sig;
+ git_annotated_commit *annotated;
cl_git_pass(git_signature_now(&sig, "me", "foo@example.com"));
@@ -264,6 +266,12 @@ void test_repo_head__setting_head_updates_reflog(void)
test_reflog(repo, 1, NULL, "tags/test^{commit}", "foo@example.com", "checkout: moving from unborn to e90810b8df3e80c413d903f631643c716887138d");
test_reflog(repo, 0, "tags/test^{commit}", "refs/heads/haacked", "foo@example.com", "checkout: moving from e90810b8df3e80c413d903f631643c716887138d to haacked");
+ cl_git_pass(git_annotated_commit_from_revspec(&annotated, repo, "haacked~0"));
+ cl_git_pass(git_repository_set_head_detached_from_annotated(repo, annotated));
+
+ test_reflog(repo, 0, NULL, "refs/heads/haacked", "foo@example.com", "checkout: moving from haacked to haacked~0");
+
+ git_annotated_commit_free(annotated);
git_object_free(tag);
git_signature_free(sig);
}
diff --git a/tests/reset/hard.c b/tests/reset/hard.c
index f6ca103..86d4be2 100644
--- a/tests/reset/hard.c
+++ b/tests/reset/hard.c
@@ -201,6 +201,7 @@ void test_reset_hard__cleans_up_merge(void)
void test_reset_hard__reflog_is_correct(void)
{
git_buf buf = GIT_BUF_INIT;
+ git_annotated_commit *annotated;
const char *exp_msg = "commit: Add a file which name should appear before the "
"\"subdir/\" folder while being dealt with by the treewalker";
@@ -215,7 +216,7 @@ void test_reset_hard__reflog_is_correct(void)
git_object_free(target);
- /* Moved branch, expect default message */
+ /* Moved branch, expect id in message */
cl_git_pass(git_revparse_single(&target, repo, "HEAD~^{commit}"));
cl_git_pass(git_buf_printf(&buf, "reset: moving to %s", git_oid_tostr_s(git_object_id(target))));
cl_git_pass(git_reset(repo, target, GIT_RESET_HARD, NULL));
@@ -223,4 +224,14 @@ void test_reset_hard__reflog_is_correct(void)
reflog_check(repo, "refs/heads/master", 4, NULL, git_buf_cstr(&buf));
git_buf_free(&buf);
+
+ /* Moved branch, expect revspec in message */
+ exp_msg = "reset: moving to HEAD~^{commit}";
+ cl_git_pass(git_annotated_commit_from_revspec(&annotated, repo, "HEAD~^{commit}"));
+ cl_git_pass(git_reset_from_annotated(repo, annotated, GIT_RESET_HARD, NULL));
+ reflog_check(repo, "HEAD", 5, NULL, exp_msg);
+ reflog_check(repo, "refs/heads/master", 5, NULL, exp_msg);
+
+ git_annotated_commit_free(annotated);
+
}
diff --git a/tests/reset/mixed.c b/tests/reset/mixed.c
index b374902..97eac74 100644
--- a/tests/reset/mixed.c
+++ b/tests/reset/mixed.c
@@ -51,6 +51,7 @@ void test_reset_mixed__resetting_refreshes_the_index_to_the_commit_tree(void)
void test_reset_mixed__reflog_is_correct(void)
{
git_buf buf = GIT_BUF_INIT;
+ git_annotated_commit *annotated;
const char *exp_msg = "commit: Updating test data so we can test inter-hunk-context";
reflog_check(repo, "HEAD", 9, "yoram.harmelin@gmail.com", exp_msg);
@@ -65,13 +66,20 @@ void test_reset_mixed__reflog_is_correct(void)
git_object_free(target);
target = NULL;
- /* Moved branch, expect default message */
+ /* Moved branch, expect id in message */
cl_git_pass(git_revparse_single(&target, repo, "HEAD~^{commit}"));
git_buf_clear(&buf);
cl_git_pass(git_buf_printf(&buf, "reset: moving to %s", git_oid_tostr_s(git_object_id(target))));
cl_git_pass(git_reset(repo, target, GIT_RESET_MIXED, NULL));
reflog_check(repo, "HEAD", 10, NULL, git_buf_cstr(&buf));
reflog_check(repo, "refs/heads/master", 10, NULL, git_buf_cstr(&buf));
-
git_buf_free(&buf);
+
+ /* Moved branch, expect revspec in message */
+ exp_msg = "reset: moving to HEAD~^{commit}";
+ cl_git_pass(git_annotated_commit_from_revspec(&annotated, repo, "HEAD~^{commit}"));
+ cl_git_pass(git_reset_from_annotated(repo, annotated, GIT_RESET_MIXED, NULL));
+ reflog_check(repo, "HEAD", 11, NULL, exp_msg);
+ reflog_check(repo, "refs/heads/master", 11, NULL, exp_msg);
+ git_annotated_commit_free(annotated);
}
diff --git a/tests/reset/soft.c b/tests/reset/soft.c
index a5bb13c..506deca 100644
--- a/tests/reset/soft.c
+++ b/tests/reset/soft.c
@@ -155,28 +155,35 @@ void test_reset_soft__fails_when_index_contains_conflicts_independently_of_MERGE
cl_assert_equal_i(GIT_EUNMERGED, git_reset(repo, target, GIT_RESET_SOFT, NULL));
}
-void test_reset_soft_reflog_is_correct(void)
+void test_reset_soft__reflog_is_correct(void)
{
- const char *exp_msg = "commit: Updating test data so we can test inter-hunk-context";
+ git_annotated_commit *annotated;
+ const char *exp_msg = "checkout: moving from br2 to master";
+ const char *master_msg = "commit: checking in";
- reflog_check(repo, "HEAD", 9, "yoram.harmelin@gmail.com", exp_msg);
- reflog_check(repo, "refs/heads/master", 9, "yoram.harmelin@gmail.com", exp_msg);
+ reflog_check(repo, "HEAD", 7, "yoram.harmelin@gmail.com", exp_msg);
+ reflog_check(repo, "refs/heads/master", 2, "yoram.harmelin@gmail.com", master_msg);
/* Branch not moving, no reflog entry */
cl_git_pass(git_revparse_single(&target, repo, "HEAD^{commit}"));
cl_git_pass(git_reset(repo, target, GIT_RESET_SOFT, NULL));
- reflog_check(repo, "HEAD", 9, "yoram.harmelin@gmail.com", exp_msg);
- reflog_check(repo, "refs/heads/master", 9, "yoram.harmelin@gmail.com", exp_msg);
+ reflog_check(repo, "HEAD", 7, "yoram.harmelin@gmail.com", exp_msg);
+ reflog_check(repo, "refs/heads/master", 2, "yoram.harmelin@gmail.com", master_msg);
+ git_object_free(target);
- /* Moved branch, expect default message */
+ /* Moved branch, expect id in message */
+ exp_msg = "reset: moving to be3563ae3f795b2b4353bcce3a527ad0a4f7f644";
cl_git_pass(git_revparse_single(&target, repo, "HEAD~^{commit}"));
cl_git_pass(git_reset(repo, target, GIT_RESET_SOFT, NULL));
- reflog_check(repo, "HEAD", 9, "yoram.harmelin@gmail.com", exp_msg);
- reflog_check(repo, "refs/heads/master", 10, NULL, "reset: moving");
+ reflog_check(repo, "HEAD", 8, "yoram.harmelin@gmail.com", exp_msg);
+ reflog_check(repo, "refs/heads/master", 3, NULL, exp_msg);
- /* Moved branch, expect custom message */
- cl_git_pass(git_revparse_single(&target, repo, "HEAD~^{commit}"));
- cl_git_pass(git_reset(repo, target, GIT_RESET_SOFT, NULL));
+ /* Moved branch, expect message with annotated string */
+ exp_msg = "reset: moving to HEAD~^{commit}";
+ cl_git_pass(git_annotated_commit_from_revspec(&annotated, repo, "HEAD~^{commit}"));
+ cl_git_pass(git_reset_from_annotated(repo, annotated, GIT_RESET_SOFT, NULL));
reflog_check(repo, "HEAD", 9, "yoram.harmelin@gmail.com", exp_msg);
- reflog_check(repo, "refs/heads/master", 11, NULL, "message1");
+ reflog_check(repo, "refs/heads/master", 4, NULL, exp_msg);
+
+ git_annotated_commit_free(annotated);
}