Commit bac95e6e1e99b1e364c5ebd39887a8e24bc1ad9d
2014-03-18T19:41:03
reflog: more comprehensive HEAD tests The existing ones lack checking zeroed ids when switching back from an unborn branch as well as what happens when detaching. The reflog appending function mistakenly wrote zeros when dealing with a detached HEAD. This explicitly checks for those situations and fixes them.
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
diff --git a/src/refdb_fs.c b/src/refdb_fs.c
index f494afa..0c30110 100644
--- a/src/refdb_fs.c
+++ b/src/refdb_fs.c
@@ -1555,7 +1555,7 @@ success:
/* Append to the reflog, must be called under reference lock */
static int reflog_append(refdb_fs_backend *backend, const git_reference *ref, const git_oid *old, const git_oid *new, const git_signature *who, const char *message)
{
- int error, is_symbolic, was_symbolic = 0;
+ int error, is_symbolic, currently_exists;
git_oid old_id = {{0}}, new_id = {{0}};
git_buf buf = GIT_BUF_INIT, path = GIT_BUF_INIT;
git_repository *repo = backend->repo;
@@ -1573,14 +1573,14 @@ static int reflog_append(refdb_fs_backend *backend, const git_reference *ref, co
if (error < 0 && error != GIT_ENOTFOUND)
return error;
- if (current_ref)
- was_symbolic = current_ref->type == GIT_REF_SYMBOLIC;
+ currently_exists = !!current_ref;
+ git_reference_free(current_ref);
/* From here on is_symoblic also means that it's HEAD */
if (old) {
git_oid_cpy(&old_id, old);
- } else if (!was_symbolic) {
+ } else if (currently_exists) {
error = git_reference_name_to_id(&old_id, repo, ref->name);
if (error == GIT_ENOTFOUND) {
memset(&old_id, 0, sizeof(git_oid));
diff --git a/tests/repo/head.c b/tests/repo/head.c
index d88fd90..a246e60 100644
--- a/tests/repo/head.c
+++ b/tests/repo/head.c
@@ -269,3 +269,75 @@ void test_repo_head__setting_head_updates_reflog(void)
git_object_free(tag);
git_signature_free(sig);
}
+
+static void assert_head_reflog(git_repository *repo, size_t idx,
+ const char *old_id, const char *new_id, const char *message)
+{
+ git_reflog *log;
+ const git_reflog_entry *entry;
+ char id_str[GIT_OID_HEXSZ + 1] = {0};
+
+ cl_git_pass(git_reflog_read(&log, repo, GIT_HEAD_FILE));
+ entry = git_reflog_entry_byindex(log, idx);
+
+ git_oid_fmt(id_str, git_reflog_entry_id_old(entry));
+ cl_assert_equal_s(old_id, id_str);
+
+ git_oid_fmt(id_str, git_reflog_entry_id_new(entry));
+ cl_assert_equal_s(new_id, id_str);
+
+ cl_assert_equal_s(message, git_reflog_entry_message(entry));
+
+ git_reflog_free(log);
+}
+
+void test_repo_head__detaching_writes_reflog(void)
+{
+ git_signature *sig;
+ git_oid id;
+ const char *msg;
+
+ cl_git_pass(git_signature_now(&sig, "me", "foo@example.com"));
+
+ msg = "message1";
+ git_oid_fromstr(&id, "e90810b8df3e80c413d903f631643c716887138d");
+ cl_git_pass(git_repository_set_head_detached(repo, &id, sig, msg));
+ assert_head_reflog(repo, 0, "a65fedf39aefe402d3bb6e24df4d4f5fe4547750",
+ "e90810b8df3e80c413d903f631643c716887138d", msg);
+
+ msg = "message2";
+ cl_git_pass(git_repository_set_head(repo, "refs/heads/haacked", sig, msg));
+ assert_head_reflog(repo, 0, "e90810b8df3e80c413d903f631643c716887138d",
+ "258f0e2a959a364e40ed6603d5d44fbb24765b10", msg);
+
+ git_signature_free(sig);
+}
+
+void test_repo_head__orphan_branch_does_not_count(void)
+{
+ git_signature *sig;
+ git_oid id;
+ const char *msg;
+
+ cl_git_pass(git_signature_now(&sig, "me", "foo@example.com"));
+
+ /* Have something known */
+ msg = "message1";
+ git_oid_fromstr(&id, "e90810b8df3e80c413d903f631643c716887138d");
+ cl_git_pass(git_repository_set_head_detached(repo, &id, sig, msg));
+ assert_head_reflog(repo, 0, "a65fedf39aefe402d3bb6e24df4d4f5fe4547750",
+ "e90810b8df3e80c413d903f631643c716887138d", msg);
+
+ /* Switching to an orphan branch does not write tot he reflog */
+ cl_git_pass(git_repository_set_head(repo, "refs/heads/orphan", sig, "ignored message"));
+ assert_head_reflog(repo, 0, "a65fedf39aefe402d3bb6e24df4d4f5fe4547750",
+ "e90810b8df3e80c413d903f631643c716887138d", msg);
+
+ /* And coming back, we set the source to zero */
+ msg = "message2";
+ cl_git_pass(git_repository_set_head(repo, "refs/heads/haacked", sig, msg));
+ assert_head_reflog(repo, 0, "0000000000000000000000000000000000000000",
+ "258f0e2a959a364e40ed6603d5d44fbb24765b10", msg);
+
+ git_signature_free(sig);
+}